From 36a11f8d1a9e2b344a3c6fb4e9c92a3a3b1a1b7b Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:52:13 +0000 Subject: [PATCH] intersphinx: Import names from proper places --- sphinx/ext/intersphinx/__main__.py | 2 +- tests/test_builders/test_build_latex.py | 2 +- tests/test_domains/test_domain_c.py | 2 +- tests/test_domains/test_domain_cpp.py | 2 +- tests/test_extensions/test_ext_inheritance_diagram.py | 2 +- tests/test_extensions/test_ext_intersphinx.py | 10 ++++------ tests/test_extensions/test_ext_intersphinx_cache.py | 2 +- tests/test_extensions/test_ext_napoleon_docstring.py | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/sphinx/ext/intersphinx/__main__.py b/sphinx/ext/intersphinx/__main__.py index aa132f9c6d8..03574468baf 100644 --- a/sphinx/ext/intersphinx/__main__.py +++ b/sphinx/ext/intersphinx/__main__.py @@ -5,7 +5,7 @@ import logging as _logging import sys -from sphinx.ext.intersphinx import inspect_main +from sphinx.ext.intersphinx._cli import inspect_main _logging.basicConfig() diff --git a/tests/test_builders/test_build_latex.py b/tests/test_builders/test_build_latex.py index 98957a6d515..49c4bb5fd01 100644 --- a/tests/test_builders/test_build_latex.py +++ b/tests/test_builders/test_build_latex.py @@ -17,8 +17,8 @@ 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 diff --git a/tests/test_domains/test_domain_c.py b/tests/test_domains/test_domain_c.py index 276ea6956f6..5416f6ec81d 100644 --- a/tests/test_domains/test_domain_c.py +++ b/tests/test_domains/test_domain_c.py @@ -25,7 +25,7 @@ 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 diff --git a/tests/test_domains/test_domain_cpp.py b/tests/test_domains/test_domain_cpp.py index 09fd0140875..98af279ebdf 100644 --- a/tests/test_domains/test_domain_cpp.py +++ b/tests/test_domains/test_domain_cpp.py @@ -26,7 +26,7 @@ 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 diff --git a/tests/test_extensions/test_ext_inheritance_diagram.py b/tests/test_extensions/test_ext_inheritance_diagram.py index c43aa2e28ee..9bb6389ae66 100644 --- a/tests/test_extensions/test_ext_inheritance_diagram.py +++ b/tests/test_extensions/test_ext_inheritance_diagram.py @@ -14,7 +14,7 @@ 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') diff --git a/tests/test_extensions/test_ext_intersphinx.py b/tests/test_extensions/test_ext_intersphinx.py index d93ffadfb2a..c0d275c38fe 100644 --- a/tests/test_extensions/test_ext_intersphinx.py +++ b/tests/test_extensions/test_ext_intersphinx.py @@ -14,20 +14,18 @@ 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 diff --git a/tests/test_extensions/test_ext_intersphinx_cache.py b/tests/test_extensions/test_ext_intersphinx_cache.py index 047589b7fd5..b7694853e6d 100644 --- a/tests/test_extensions/test_ext_intersphinx_cache.py +++ b/tests/test_extensions/test_ext_intersphinx_cache.py @@ -9,7 +9,7 @@ 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 diff --git a/tests/test_extensions/test_ext_napoleon_docstring.py b/tests/test_extensions/test_ext_napoleon_docstring.py index 393aeac7de8..74dd625692a 100644 --- a/tests/test_extensions/test_ext_napoleon_docstring.py +++ b/tests/test_extensions/test_ext_napoleon_docstring.py @@ -12,7 +12,7 @@ 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,