Sphinx 7.2.5__py3-none-any.whl → 7.3.0__py3-none-any.whl

sphinx/transforms/__init__.py

@@ -21,7 +21,7 @@ from sphinx.util.i18n import format_date
 from sphinx.util.nodes import apply_source_workaround, is_smartquotable
 
 if TYPE_CHECKING:
-    from collections.abc import Generator
+    from collections.abc import Iterator
 
     from docutils.nodes import Node, Text
 
@@ -29,6 +29,7 @@ if TYPE_CHECKING:
     from sphinx.config import Config
     from sphinx.domains.std import StandardDomain
     from sphinx.environment import BuildEnvironment
+    from sphinx.util.typing import ExtensionMetadata
 
 
 logger = logging.getLogger(__name__)
@@ -80,7 +81,7 @@ class SphinxTransformer(Transformer):
             if not hasattr(self.document.settings, 'env') and self.env:
                 self.document.settings.env = self.env
 
-            super().apply_transforms()
+            super().apply_transforms()  # type: ignore[misc]
         else:
             # wrap the target node by document node during transforming
             try:
@@ -98,6 +99,7 @@ class DefaultSubstitutions(SphinxTransform):
     """
     Replace some substitutions if they aren't defined in the document.
     """
+
     # run before the default Substitutions
     default_priority = 210
 
@@ -139,6 +141,7 @@ class MoveModuleTargets(SphinxTransform):
 
     XXX Python specific
     """
+
     default_priority = 210
 
     def apply(self, **kwargs: Any) -> None:
@@ -161,6 +164,7 @@ class HandleCodeBlocks(SphinxTransform):
     """
     Several code block related transformations.
     """
+
     default_priority = 210
 
     def apply(self, **kwargs: Any) -> None:
@@ -185,6 +189,7 @@ class AutoNumbering(SphinxTransform):
     """
     Register IDs of tables, figures and literal_blocks to assign numbers.
     """
+
     default_priority = 210
 
     def apply(self, **kwargs: Any) -> None:
@@ -201,6 +206,7 @@ class SortIds(SphinxTransform):
     """
     Sort section IDs so that the "id[0-9]+" one comes last.
     """
+
     default_priority = 261
 
     def apply(self, **kwargs: Any) -> None:
@@ -222,6 +228,7 @@ class ApplySourceWorkaround(SphinxTransform):
     """
     Update source and rawsource attributes
     """
+
     default_priority = 10
 
     def apply(self, **kwargs: Any) -> None:
@@ -234,6 +241,7 @@ class AutoIndexUpgrader(SphinxTransform):
     """
     Detect old style (4 column based indices) and automatically upgrade to new style.
     """
+
     default_priority = 210
 
     def apply(self, **kwargs: Any) -> None:
@@ -244,13 +252,14 @@ class AutoIndexUpgrader(SphinxTransform):
                 logger.warning(msg, location=node)
                 for i, entry in enumerate(node['entries']):
                     if len(entry) == 4:
-                        node['entries'][i] = entry + (None,)
+                        node['entries'][i] = (*entry, None)
 
 
 class ExtraTranslatableNodes(SphinxTransform):
     """
     Make nodes translatable
     """
+
     default_priority = 10
 
     def apply(self, **kwargs: Any) -> None:
@@ -270,6 +279,7 @@ class UnreferencedFootnotesDetector(SphinxTransform):
     """
     Detect unreferenced footnotes and emit warnings
     """
+
     default_priority = 200
 
     def apply(self, **kwargs: Any) -> None:
@@ -291,6 +301,7 @@ class UnreferencedFootnotesDetector(SphinxTransform):
 
 class DoctestTransform(SphinxTransform):
     """Set "doctest" style to each doctest_block node"""
+
     default_priority = 500
 
     def apply(self, **kwargs: Any) -> None:
@@ -300,6 +311,7 @@ class DoctestTransform(SphinxTransform):
 
 class FilterSystemMessages(SphinxTransform):
     """Filter system messages from a doctree."""
+
     default_priority = 999
 
     def apply(self, **kwargs: Any) -> None:
@@ -315,6 +327,7 @@ class SphinxContentsFilter(ContentsFilter):
     Used with BuildEnvironment.add_toc_from() to discard cross-file links
     within table-of-contents link nodes.
     """
+
     visit_pending_xref = ContentsFilter.ignore_node_but_process_children
 
     def visit_image(self, node: nodes.image) -> None:
@@ -327,6 +340,7 @@ class SphinxSmartQuotes(SmartQuotes, SphinxTransform):
 
     refs: sphinx.parsers.RSTParser
     """
+
     default_priority = 750
 
     def apply(self, **kwargs: Any) -> None:
@@ -362,7 +376,7 @@ class SphinxSmartQuotes(SmartQuotes, SphinxTransform):
             for tag in normalize_language_tag(language)
         )
 
-    def get_tokens(self, txtnodes: list[Text]) -> Generator[tuple[str, str], None, None]:
+    def get_tokens(self, txtnodes: list[Text]) -> Iterator[tuple[str, str]]:
         # A generator that yields ``(texttype, nodetext)`` tuples for a list
         # of "Text" nodes (interface to ``smartquotes.educate_tokens()``).
         for txtnode in txtnodes:
@@ -377,32 +391,16 @@ class SphinxSmartQuotes(SmartQuotes, SphinxTransform):
 
 class DoctreeReadEvent(SphinxTransform):
     """Emit :event:`doctree-read` event."""
+
     default_priority = 880
 
     def apply(self, **kwargs: Any) -> None:
         self.app.emit('doctree-read', self.document)
 
 
-class ManpageLink(SphinxTransform):
-    """Find manpage section numbers and names"""
-    default_priority = 999
-
-    def apply(self, **kwargs: Any) -> None:
-        for node in self.document.findall(addnodes.manpage):
-            manpage = ' '.join([str(x) for x in node.children
-                                if isinstance(x, nodes.Text)])
-            pattern = r'^(?P<path>(?P<page>.+)[\(\.](?P<section>[1-9]\w*)?\)?)$'
-            info = {'path': manpage,
-                    'page': manpage,
-                    'section': ''}
-            r = re.match(pattern, manpage)
-            if r:
-                info = r.groupdict()
-            node.attributes.update(info)
-
-
 class GlossarySorter(SphinxTransform):
     """Sort glossaries that have the ``sorted`` flag."""
+
     # This must be done after i18n, therefore not right
     # away in the glossary directive.
     default_priority = 500
@@ -491,7 +489,7 @@ def _sort_key(node: nodes.Node) -> int:
     raise ValueError(msg)
 
 
-def setup(app: Sphinx) -> dict[str, Any]:
+def setup(app: Sphinx) -> ExtensionMetadata:
     app.add_transform(ApplySourceWorkaround)
     app.add_transform(ExtraTranslatableNodes)
     app.add_transform(DefaultSubstitutions)
@@ -505,7 +503,6 @@ def setup(app: Sphinx) -> dict[str, Any]:
     app.add_transform(UnreferencedFootnotesDetector)
     app.add_transform(SphinxSmartQuotes)
     app.add_transform(DoctreeReadEvent)
-    app.add_transform(ManpageLink)
     app.add_transform(GlossarySorter)
     app.add_transform(ReorderConsecutiveTargetAndIndexNodes)
 

sphinx/transforms/compact_bullet_list.py

@@ -13,6 +13,7 @@ if TYPE_CHECKING:
     from docutils.nodes import Node
 
     from sphinx.application import Sphinx
+    from sphinx.util.typing import ExtensionMetadata
 
 
 class RefOnlyListChecker(nodes.GenericNodeVisitor):
@@ -29,10 +30,8 @@ class RefOnlyListChecker(nodes.GenericNodeVisitor):
         pass
 
     def visit_list_item(self, node: nodes.list_item) -> None:
-        children: list[Node] = []
-        for child in node.children:
-            if not isinstance(child, nodes.Invisible):
-                children.append(child)
+        children: list[Node] = [child for child in node.children
+                                if not isinstance(child, nodes.Invisible)]
         if len(children) != 1:
             raise nodes.NodeFound
         if not isinstance(children[0], nodes.paragraph):
@@ -55,6 +54,7 @@ class RefOnlyBulletListTransform(SphinxTransform):
     Specifically implemented for 'Indices and Tables' section, which looks
     odd when html_compact_lists is false.
     """
+
     default_priority = 100
 
     def apply(self, **kwargs: Any) -> None:
@@ -81,7 +81,7 @@ class RefOnlyBulletListTransform(SphinxTransform):
                     item.replace(para, compact_para)
 
 
-def setup(app: Sphinx) -> dict[str, Any]:
+def setup(app: Sphinx) -> ExtensionMetadata:
     app.add_transform(RefOnlyBulletListTransform)
 
     return {

sphinx/transforms/i18n.py

@@ -33,6 +33,7 @@ if TYPE_CHECKING:
 
     from sphinx.application import Sphinx
     from sphinx.config import Config
+    from sphinx.util.typing import ExtensionMetadata
 
 
 logger = logging.getLogger(__name__)
@@ -77,7 +78,7 @@ def publish_msgstr(app: Sphinx, source: str, source_path: str, source_line: int,
             settings=settings,
         )
         with contextlib.suppress(IndexError):  # empty node
-            return doc[0]  # type: ignore[return-value]
+            return doc[0]
         return doc
     finally:
         config.rst_prolog = rst_prolog  # type: ignore[attr-defined]
@@ -95,6 +96,7 @@ class PreserveTranslatableMessages(SphinxTransform):
     """
     Preserve original translatable messages before translation
     """
+
     default_priority = 10  # this MUST be invoked before Locale transform
 
     def apply(self, **kwargs: Any) -> None:
@@ -136,7 +138,7 @@ class _NodeUpdater:
             if old_name != new_name:
                 # if name would be changed, replace node names and
                 # document nameids mapping with new name.
-                names = section_node.setdefault('names', [])
+                names: list[str] = section_node.setdefault('names', [])
                 names.append(new_name)
                 # Original section name (reference target name) should be kept to refer
                 # from other nodes which is still not translated or uses explicit target
@@ -181,7 +183,7 @@ class _NodeUpdater:
 
                 # replace target's refname to new target name
                 matcher = NodeMatcher(nodes.target, refname=old_name)
-                for old_target in self.document.findall(matcher):  # type: nodes.target
+                for old_target in matcher.findall(self.document):
                     old_target['refname'] = new_name
 
                 processed = True
@@ -197,10 +199,8 @@ class _NodeUpdater:
                 lst.append(new)
 
         is_autofootnote_ref = NodeMatcher(nodes.footnote_reference, auto=Any)
-        old_foot_refs: list[nodes.footnote_reference] = [
-            *self.node.findall(is_autofootnote_ref)]
-        new_foot_refs: list[nodes.footnote_reference] = [
-            *self.patch.findall(is_autofootnote_ref)]
+        old_foot_refs = list(is_autofootnote_ref.findall(self.node))
+        new_foot_refs = list(is_autofootnote_ref.findall(self.patch))
         self.compare_references(old_foot_refs, new_foot_refs,
                                 __('inconsistent footnote references in translated message.' +
                                    ' original: {0}, translated: {1}'))
@@ -239,8 +239,8 @@ class _NodeUpdater:
         # * use translated refname for section refname.
         # * inline reference "`Python <...>`_" has no 'refname'.
         is_refnamed_ref = NodeMatcher(nodes.reference, refname=Any)
-        old_refs: list[nodes.reference] = [*self.node.findall(is_refnamed_ref)]
-        new_refs: list[nodes.reference] = [*self.patch.findall(is_refnamed_ref)]
+        old_refs = list(is_refnamed_ref.findall(self.node))
+        new_refs = list(is_refnamed_ref.findall(self.patch))
         self.compare_references(old_refs, new_refs,
                                 __('inconsistent references in translated message.' +
                                    ' original: {0}, translated: {1}'))
@@ -263,10 +263,8 @@ class _NodeUpdater:
     def update_refnamed_footnote_references(self) -> None:
         # refnamed footnote should use original 'ids'.
         is_refnamed_footnote_ref = NodeMatcher(nodes.footnote_reference, refname=Any)
-        old_foot_refs: list[nodes.footnote_reference] = [*self.node.findall(
-            is_refnamed_footnote_ref)]
-        new_foot_refs: list[nodes.footnote_reference] = [*self.patch.findall(
-            is_refnamed_footnote_ref)]
+        old_foot_refs = list(is_refnamed_footnote_ref.findall(self.node))
+        new_foot_refs = list(is_refnamed_footnote_ref.findall(self.patch))
         refname_ids_map: dict[str, list[str]] = {}
         self.compare_references(old_foot_refs, new_foot_refs,
                                 __('inconsistent footnote references in translated message.' +
@@ -281,8 +279,8 @@ class _NodeUpdater:
     def update_citation_references(self) -> None:
         # citation should use original 'ids'.
         is_citation_ref = NodeMatcher(nodes.citation_reference, refname=Any)
-        old_cite_refs: list[nodes.citation_reference] = [*self.node.findall(is_citation_ref)]
-        new_cite_refs: list[nodes.citation_reference] = [*self.patch.findall(is_citation_ref)]
+        old_cite_refs = list(is_citation_ref.findall(self.node))
+        new_cite_refs = list(is_citation_ref.findall(self.patch))
         self.compare_references(old_cite_refs, new_cite_refs,
                                 __('inconsistent citation references in translated message.' +
                                    ' original: {0}, translated: {1}'))
@@ -339,6 +337,7 @@ class Locale(SphinxTransform):
     """
     Replace translatable nodes with their translated doctree.
     """
+
     default_priority = 20
 
     def apply(self, **kwargs: Any) -> None:
@@ -395,7 +394,7 @@ class Locale(SphinxTransform):
                 msgstr = '::\n\n' + indent(msgstr, ' ' * 3)
 
             patch = publish_msgstr(self.app, msgstr, source,
-                                   node.line, self.config, settings)
+                                   node.line, self.config, settings)  # type: ignore[arg-type]
             # FIXME: no warnings about inconsistent references in this part
             # XXX doctest and other block markup
             if not isinstance(patch, nodes.paragraph):
@@ -409,10 +408,10 @@ class Locale(SphinxTransform):
                 for _id in node['ids']:
                     parts = split_term_classifiers(msgstr)
                     patch = publish_msgstr(
-                        self.app, parts[0] or '', source, node.line, self.config, settings,
+                        self.app, parts[0] or '', source, node.line, self.config, settings,  # type: ignore[arg-type]
                     )
                     updater.patch = make_glossary_term(
-                        self.env, patch, parts[1] or '', source, node.line, _id, self.document,
+                        self.env, patch, parts[1] or '', source, node.line, _id, self.document,  # type: ignore[arg-type]
                     )
                     processed = True
 
@@ -441,11 +440,11 @@ class Locale(SphinxTransform):
 
             # update translatable nodes
             if isinstance(node, addnodes.translatable):
-                node.apply_translated_message(msg, msgstr)  # type: ignore[attr-defined]
+                node.apply_translated_message(msg, msgstr)
                 continue
 
             # update meta nodes
-            if isinstance(node, nodes.meta):  # type: ignore[attr-defined]
+            if isinstance(node, nodes.meta):
                 node['content'] = msgstr
                 node['translated'] = True
                 continue
@@ -475,11 +474,11 @@ class Locale(SphinxTransform):
                 msgstr = msgstr + '\n' + '=' * len(msgstr) * 2
 
             patch = publish_msgstr(self.app, msgstr, source,
-                                   node.line, self.config, settings)
+                                   node.line, self.config, settings)  # type: ignore[arg-type]
             # Structural Subelements phase2
             if isinstance(node, nodes.title):
                 # get <title> node that placed as a first child
-                patch = patch.next_node()
+                patch = patch.next_node()  # type: ignore[assignment]
 
             # ignore unexpected markups in translation message
             unexpected: tuple[type[nodes.Element], ...] = (
@@ -538,6 +537,7 @@ class TranslationProgressTotaliser(SphinxTransform):
     """
     Calculate the number of translated and untranslated nodes.
     """
+
     default_priority = 25  # MUST happen after Locale
 
     def apply(self, **kwargs: Any) -> None:
@@ -546,7 +546,7 @@ class TranslationProgressTotaliser(SphinxTransform):
             return
 
         total = translated = 0
-        for node in self.document.findall(NodeMatcher(translated=Any)):  # type: nodes.Element
+        for node in NodeMatcher(nodes.Element, translated=Any).findall(self.document):
             total += 1
             if node['translated']:
                 translated += 1
@@ -561,6 +561,7 @@ class AddTranslationClasses(SphinxTransform):
     """
     Add ``translated`` or ``untranslated`` classes to indicate translation status.
     """
+
     default_priority = 950
 
     def apply(self, **kwargs: Any) -> None:
@@ -584,19 +585,20 @@ class AddTranslationClasses(SphinxTransform):
                    'True, False, "translated" or "untranslated"')
             raise ConfigError(msg)
 
-        for node in self.document.findall(NodeMatcher(translated=Any)):  # type: nodes.Element
+        for node in NodeMatcher(nodes.Element, translated=Any).findall(self.document):
             if node['translated']:
                 if add_translated:
-                    node.setdefault('classes', []).append('translated')
+                    node.setdefault('classes', []).append('translated')  # type: ignore[arg-type]
             else:
                 if add_untranslated:
-                    node.setdefault('classes', []).append('untranslated')
+                    node.setdefault('classes', []).append('untranslated')  # type: ignore[arg-type]
 
 
 class RemoveTranslatableInline(SphinxTransform):
     """
     Remove inline nodes used for translation as placeholders.
     """
+
     default_priority = 999
 
     def apply(self, **kwargs: Any) -> None:
@@ -605,12 +607,12 @@ class RemoveTranslatableInline(SphinxTransform):
             return
 
         matcher = NodeMatcher(nodes.inline, translatable=Any)
-        for inline in list(self.document.findall(matcher)):  # type: nodes.inline
+        for inline in matcher.findall(self.document):
             inline.parent.remove(inline)
             inline.parent += inline.children
 
 
-def setup(app: Sphinx) -> dict[str, Any]:
+def setup(app: Sphinx) -> ExtensionMetadata:
     app.add_transform(PreserveTranslatableMessages)
     app.add_transform(Locale)
     app.add_transform(TranslationProgressTotaliser)

sphinx/transforms/post_transforms/__init__.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import re
+from itertools import starmap
 from typing import TYPE_CHECKING, Any, cast
 
 from docutils import nodes
@@ -22,6 +23,7 @@ if TYPE_CHECKING:
     from sphinx.addnodes import pending_xref
     from sphinx.application import Sphinx
     from sphinx.domains import Domain
+    from sphinx.util.typing import ExtensionMetadata
 
 logger = logging.getLogger(__name__)
 
@@ -33,6 +35,7 @@ class SphinxPostTransform(SphinxTransform):
     They resolve references, convert images, do special transformation for each output
     formats and so on.  This class helps to implement these post transforms.
     """
+
     builders: tuple[str, ...] = ()
     formats: tuple[str, ...] = ()
 
@@ -44,10 +47,7 @@ class SphinxPostTransform(SphinxTransform):
         """Check this transform working for current builder."""
         if self.builders and self.app.builder.name not in self.builders:
             return False
-        if self.formats and self.app.builder.format not in self.formats:
-            return False
-
-        return True
+        return not self.formats or self.app.builder.format in self.formats
 
     def run(self, **kwargs: Any) -> None:
         """Main method of post transforms.
@@ -81,7 +81,7 @@ class ReferencesResolver(SphinxPostTransform):
             domain = None
 
             try:
-                if 'refdomain' in node and node['refdomain']:
+                if node.get('refdomain', False):
                     # let the domain try to resolve the reference
                     try:
                         domain = self.env.domains[node['refdomain']]
@@ -154,7 +154,7 @@ class ReferencesResolver(SphinxPostTransform):
             def stringify(name: str, node: Element) -> str:
                 reftitle = node.get('reftitle', node.astext())
                 return f':{name}:`{reftitle}`'
-            candidates = ' or '.join(stringify(name, role) for name, role in results)
+            candidates = ' or '.join(starmap(stringify, results))
             logger.warning(__("more than one target found for 'any' cross-"
                               'reference %r: could be %s'), target, candidates,
                            location=node)
@@ -234,6 +234,7 @@ class OnlyNodeTransform(SphinxPostTransform):
 
 class SigElementFallbackTransform(SphinxPostTransform):
     """Fallback various desc_* nodes to inline if translator does not support them."""
+
     default_priority = 200
 
     def run(self, **kwargs: Any) -> None:
@@ -276,6 +277,7 @@ class SigElementFallbackTransform(SphinxPostTransform):
 
 class PropagateDescDomain(SphinxPostTransform):
     """Add the domain name of the parent node as a class in each desc_signature node."""
+
     default_priority = 200
 
     def run(self, **kwargs: Any) -> None:
@@ -284,7 +286,7 @@ class PropagateDescDomain(SphinxPostTransform):
                 node['classes'].append(node.parent['domain'])
 
 
-def setup(app: Sphinx) -> dict[str, Any]:
+def setup(app: Sphinx) -> ExtensionMetadata:
     app.add_post_transform(ReferencesResolver)
     app.add_post_transform(OnlyNodeTransform)
     app.add_post_transform(SigElementFallbackTransform)

sphinx/transforms/post_transforms/code.py

@@ -16,6 +16,7 @@ if TYPE_CHECKING:
     from docutils.nodes import Node, TextElement
 
     from sphinx.application import Sphinx
+    from sphinx.util.typing import ExtensionMetadata
 
 
 class HighlightSetting(NamedTuple):
@@ -32,6 +33,7 @@ class HighlightLanguageTransform(SphinxTransform):
     :rst:dir:`highlight` directive.  After processing, this transform
     removes ``highlightlang`` node from doctree.
     """
+
     default_priority = 400
 
     def apply(self, **kwargs: Any) -> None:
@@ -88,6 +90,7 @@ class TrimDoctestFlagsTransform(SphinxTransform):
 
     see :confval:`trim_doctest_flags` for more information.
     """
+
     default_priority = HighlightLanguageTransform.default_priority + 1
 
     def apply(self, **kwargs: Any) -> None:
@@ -128,7 +131,7 @@ class TrimDoctestFlagsTransform(SphinxTransform):
         return False
 
 
-def setup(app: Sphinx) -> dict[str, Any]:
+def setup(app: Sphinx) -> ExtensionMetadata:
     app.add_post_transform(HighlightLanguageTransform)
     app.add_post_transform(TrimDoctestFlagsTransform)
 

sphinx/transforms/post_transforms/images.py

@@ -19,6 +19,7 @@ from sphinx.util.osutil import ensuredir
 
 if TYPE_CHECKING:
     from sphinx.application import Sphinx
+    from sphinx.util.typing import ExtensionMetadata
 
 logger = logging.getLogger(__name__)
 
@@ -47,7 +48,7 @@ class ImageDownloader(BaseImageConverter):
     default_priority = 100
 
     def match(self, node: nodes.image) -> bool:
-        if self.app.builder.supported_image_types == []:
+        if not self.app.builder.supported_image_types:
             return False
         if self.app.builder.supported_remote_images:
             return False
@@ -61,21 +62,23 @@ class ImageDownloader(BaseImageConverter):
             if basename == '' or len(basename) > MAX_FILENAME_LEN:
                 filename, ext = os.path.splitext(node['uri'])
                 basename = sha1(filename.encode(), usedforsecurity=False).hexdigest() + ext
-            basename = re.sub(CRITICAL_PATH_CHAR_RE, "_", basename)
+            basename = CRITICAL_PATH_CHAR_RE.sub("_", basename)
 
-            dirname = node['uri'].replace('://', '/').translate({ord("?"): "/",
-                                                                 ord("&"): "/"})
-            if len(dirname) > MAX_FILENAME_LEN:
-                dirname = sha1(dirname.encode(), usedforsecurity=False).hexdigest()
-            ensuredir(os.path.join(self.imagedir, dirname))
-            path = os.path.join(self.imagedir, dirname, basename)
+            uri_hash = sha1(node['uri'].encode(), usedforsecurity=False).hexdigest()
+            ensuredir(os.path.join(self.imagedir, uri_hash))
+            path = os.path.join(self.imagedir, uri_hash, basename)
 
             headers = {}
             if os.path.exists(path):
                 timestamp: float = ceil(os.stat(path).st_mtime)
                 headers['If-Modified-Since'] = epoch_to_rfc1123(timestamp)
 
-            r = requests.get(node['uri'], headers=headers)
+            config = self.app.config
+            r = requests.get(
+                node['uri'], headers=headers,
+                _user_agent=config.user_agent,
+                _tls_info=(config.tls_verify, config.tls_cacerts),
+            )
             if r.status_code >= 400:
                 logger.warning(__('Could not fetch remote image: %s [%d]') %
                                (node['uri'], r.status_code))
@@ -95,7 +98,7 @@ class ImageDownloader(BaseImageConverter):
                 if mimetype != '*' and os.path.splitext(basename)[1] == '':
                     # append a suffix if URI does not contain suffix
                     ext = get_image_extension(mimetype)
-                    newpath = os.path.join(self.imagedir, dirname, basename + ext)
+                    newpath = os.path.join(self.imagedir, uri_hash, basename + ext)
                     os.replace(path, newpath)
                     self.app.env.original_image_uri.pop(path)
                     self.app.env.original_image_uri[newpath] = node['uri']
@@ -112,7 +115,7 @@ class DataURIExtractor(BaseImageConverter):
     default_priority = 150
 
     def match(self, node: nodes.image) -> bool:
-        if self.app.builder.supported_remote_images == []:
+        if not self.app.builder.supported_remote_images:
             return False
         if self.app.builder.supported_data_uri_images is True:
             return False
@@ -143,7 +146,7 @@ class DataURIExtractor(BaseImageConverter):
 
 def get_filename_for(filename: str, mimetype: str) -> str:
     basename = os.path.basename(filename)
-    basename = re.sub(CRITICAL_PATH_CHAR_RE, "_", basename)
+    basename = CRITICAL_PATH_CHAR_RE.sub("_", basename)
     return os.path.splitext(basename)[0] + (get_image_extension(mimetype) or '')
 
 
@@ -168,6 +171,7 @@ class ImageConverter(BaseImageConverter):
     3. Register your image converter to Sphinx using
        :py:meth:`.Sphinx.add_post_transform`
     """
+
     default_priority = 200
 
     #: The converter is available or not.  Will be filled at the first call of
@@ -269,7 +273,7 @@ class ImageConverter(BaseImageConverter):
         raise NotImplementedError
 
 
-def setup(app: Sphinx) -> dict[str, Any]:
+def setup(app: Sphinx) -> ExtensionMetadata:
     app.add_post_transform(ImageDownloader)
     app.add_post_transform(DataURIExtractor)
 

sphinx/transforms/references.py

@@ -10,6 +10,7 @@ from sphinx.transforms import SphinxTransform
 
 if TYPE_CHECKING:
     from sphinx.application import Sphinx
+    from sphinx.util.typing import ExtensionMetadata
 
 
 class SphinxDanglingReferences(DanglingReferences):
@@ -29,6 +30,7 @@ class SphinxDanglingReferences(DanglingReferences):
 
 class SphinxDomains(SphinxTransform):
     """Collect objects to Sphinx domains for cross references."""
+
     default_priority = 850
 
     def apply(self, **kwargs: Any) -> None:
@@ -36,7 +38,7 @@ class SphinxDomains(SphinxTransform):
             domain.process_doc(self.env, self.env.docname, self.document)
 
 
-def setup(app: Sphinx) -> dict[str, Any]:
+def setup(app: Sphinx) -> ExtensionMetadata:
     app.add_transform(SphinxDanglingReferences)
     app.add_transform(SphinxDomains)