Un-deprecate sphinx.util.import_object

Author: mgeier

sphinx/builders/__init__.py

@@ -24,10 +24,10 @@
 from sphinx.locale import __
 from sphinx.util import (
     get_filetype,
+    import_object,
     logging,
     rst,
 )
-from sphinx.util._importer import import_object
 from sphinx.util._pathlib import _StrPathProperty
 from sphinx.util.build_phase import BuildPhase
 from sphinx.util.display import progress_message, status_iterator

sphinx/search/ja.py

@@ -35,7 +35,7 @@
 
 from sphinx.errors import ExtensionError, SphinxError
 from sphinx.search import SearchLanguage
-from sphinx.util._importer import import_object
+from sphinx.util import import_object
 
 
 class BaseSplitter:

sphinx/util/__init__.py

@@ -98,12 +98,6 @@ def __getattr__(name: str) -> Any:
         _deprecation_warning(__name__, name, '', remove=(10, 0))
         return obj
 
-    if name == 'import_object':
-        from sphinx.util._importer import import_object
-
-        _deprecation_warning(__name__, name, '', remove=(10, 0))
-        return import_object
-
     # Re-exported for backwards compatibility,
     # but not currently deprecated
 
@@ -112,6 +106,11 @@ def __getattr__(name: str) -> Any:
 
         return encode_uri
 
+    if name == 'import_object':
+        from sphinx.util._importer import import_object
+
+        return import_object
+
     if name == 'isurl':
         from sphinx.util._uri import is_url
 

tests/test_util/test_util.py

@@ -69,12 +69,11 @@ def test_exported_attributes():
         assert sphinx.util.FilenameUniqDict is FilenameUniqDict
     with pytest.warns(RemovedInSphinx10Warning, match=r'deprecated.'):
         assert sphinx.util.DownloadFiles is DownloadFiles
-    with pytest.warns(RemovedInSphinx10Warning, match=r'deprecated.'):
-        assert sphinx.util.import_object is import_object
 
     # Re-exported for backwards compatibility,
     # but not currently deprecated
     assert sphinx.util.encode_uri is encode_uri
+    assert sphinx.util.import_object is import_object
     assert sphinx.util.isurl is is_url
     assert sphinx.util.parselinenos is parse_line_num_spec
     assert sphinx.util.patfilter is patfilter