Fixed two more bugs with SVG inheritance-diagram links

sphinx-doc · Aug 22, 2023 · 23b1c30 · 23b1c30
1 parent 6183b6a
commit 23b1c30
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -11,6 +11,9 @@ Bugs fixed
 
 * Fix regression in ``autodoc.Documenter.parse_name()``.
 * Fix regression in JSON serialisation.
+* #11634: Fixed two more bugs in inheritance diagrams that resulted in
+  broken links.
+  Patch by Albert Shih.
 
 Release 7.2.2 (released Aug 17, 2023)
 =====================================

diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
@@ -235,10 +235,11 @@ def fix_svg_relative_paths(self: SphinxTranslator, filepath: str) -> None:
             # not a relative link
             continue
 
-        old_path = path.join(self.builder.outdir, url)
+        docdir = path.dirname(path.join(self.builder.outdir, self.builder.current_docname))
+        old_path = path.join(docdir, url)
         new_path = path.relpath(
             old_path,
-            start=path.join(self.builder.outdir, self.builder.imgpath),
+            start=path.join(docdir, self.builder.imgpath),
         )
         modified_url = urlunsplit((scheme, hostname, new_path, query, fragment))
 

diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py
@@ -36,6 +36,7 @@ class E(B): pass
 import re
 from collections.abc import Iterable, Sequence
 from importlib import import_module
+from os import path
 from typing import TYPE_CHECKING, Any, cast
 
 from docutils import nodes
@@ -417,7 +418,7 @@ def html_visit_inheritance_diagram(self: HTML5Translator, node: inheritance_diag
 
     # Create a mapping from fully-qualified class names to URLs.
     graphviz_output_format = self.builder.env.config.graphviz_output_format.upper()
-    current_filename = self.builder.current_docname + self.builder.out_suffix
+    current_filename = path.basename(self.builder.current_docname + self.builder.out_suffix)
     urls = {}
     pending_xrefs = cast(Iterable[addnodes.pending_xref], node)
     for child in pending_xrefs:

diff --git a/tests/roots/test-ext-inheritance_diagram/subdir/index.rst b/tests/roots/test-ext-inheritance_diagram/subdir/index.rst
@@ -4,4 +4,6 @@ test-ext-inheritance_diagram subdirectory
 
 .. inheritance-diagram:: test.DocMainLevel
 
+.. inheritance-diagram:: test.DocLowerLevel
+
 .. py:class:: test.DocLowerLevel