intersphinx: Import names from proper places (#13244)

sphinx/ext/intersphinx/__main__.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import logging as _logging
 import sys
 
-from sphinx.ext.intersphinx import inspect_main
+from sphinx.ext.intersphinx._cli import inspect_main
 
 _logging.basicConfig()
 

tests/test_builders/test_build_latex.py

@@ -17,8 +17,8 @@ import pytest
 from sphinx.builders.latex import default_latex_documents
 from sphinx.config import Config
 from sphinx.errors import SphinxError
-from sphinx.ext.intersphinx import load_mappings, validate_intersphinx_mapping
 from sphinx.ext.intersphinx import setup as intersphinx_setup
+from sphinx.ext.intersphinx._load import load_mappings, validate_intersphinx_mapping
 from sphinx.util.osutil import ensuredir
 from sphinx.writers.latex import LaTeXTranslator
 

tests/test_domains/test_domain_c.py

@@ -25,7 +25,7 @@ from sphinx.addnodes import (
 from sphinx.domains.c._ids import _id_prefix, _macro_keywords, _max_id
 from sphinx.domains.c._parser import DefinitionParser
 from sphinx.domains.c._symbol import Symbol
-from sphinx.ext.intersphinx import load_mappings, validate_intersphinx_mapping
+from sphinx.ext.intersphinx._load import load_mappings, validate_intersphinx_mapping
 from sphinx.testing import restructuredtext
 from sphinx.testing.util import assert_node
 from sphinx.util.cfamily import DefinitionError

tests/test_domains/test_domain_cpp.py

@@ -26,7 +26,7 @@ from sphinx.addnodes import (
 from sphinx.domains.cpp._ids import _id_prefix, _max_id
 from sphinx.domains.cpp._parser import DefinitionParser
 from sphinx.domains.cpp._symbol import Symbol
-from sphinx.ext.intersphinx import load_mappings, validate_intersphinx_mapping
+from sphinx.ext.intersphinx._load import load_mappings, validate_intersphinx_mapping
 from sphinx.testing import restructuredtext
 from sphinx.testing.util import assert_node
 from sphinx.util.cfamily import DefinitionError, NoOldIdError

tests/test_extensions/test_ext_inheritance_diagram.py

@@ -14,7 +14,7 @@ from sphinx.ext.inheritance_diagram import (
     InheritanceException,
     import_classes,
 )
-from sphinx.ext.intersphinx import load_mappings, validate_intersphinx_mapping
+from sphinx.ext.intersphinx._load import load_mappings, validate_intersphinx_mapping
 
 
 @pytest.mark.sphinx('html', testroot='inheritance')

tests/test_extensions/test_ext_intersphinx.py

@@ -14,20 +14,18 @@ from sphinx import addnodes
 from sphinx.builders.html import INVENTORY_FILENAME
 from sphinx.config import Config
 from sphinx.errors import ConfigError
-from sphinx.ext.intersphinx import (
-    inspect_main,
-    load_mappings,
-    missing_reference,
-    validate_intersphinx_mapping,
-)
 from sphinx.ext.intersphinx import setup as intersphinx_setup
+from sphinx.ext.intersphinx._cli import inspect_main
 from sphinx.ext.intersphinx._load import (
     _fetch_inventory,
     _fetch_inventory_group,
     _get_safe_url,
     _InvConfig,
     _strip_basic_auth,
+    load_mappings,
+    validate_intersphinx_mapping,
 )
+from sphinx.ext.intersphinx._resolve import missing_reference
 from sphinx.ext.intersphinx._shared import _IntersphinxProject
 from sphinx.util.console import strip_colors
 

tests/test_extensions/test_ext_intersphinx_cache.py

@@ -9,7 +9,7 @@ from http.server import BaseHTTPRequestHandler
 from io import BytesIO
 from typing import TYPE_CHECKING
 
-from sphinx.ext.intersphinx import InventoryAdapter
+from sphinx.ext.intersphinx._shared import InventoryAdapter
 from sphinx.testing.util import SphinxTestApp
 
 from tests.utils import http_server

tests/test_extensions/test_ext_napoleon_docstring.py

@@ -12,7 +12,7 @@ from unittest import mock
 
 import pytest
 
-from sphinx.ext.intersphinx import load_mappings, validate_intersphinx_mapping
+from sphinx.ext.intersphinx._load import load_mappings, validate_intersphinx_mapping
 from sphinx.ext.napoleon import Config
 from sphinx.ext.napoleon.docstring import (
     GoogleDocstring,