Trying to work around upcoming changes in Sphinx 7.2.0

spatialaudio · Aug 13, 2023 · b4dc4be · b4dc4be
1 parent 55c4809
commit b4dc4be
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/nbsphinx/__init__.py b/src/nbsphinx/__init__.py
@@ -1479,7 +1479,13 @@ def handle(self, node):
                 node['width'], node['height'] = map(str, size)
 
 
-original_toctree_resolve = sphinx.environment.adapters.toctree.TocTree.resolve
+if hasattr(sphinx.environment.adapters.toctree, '_resolve_toctree'):
+    # Since Sphinx 7.2.0
+    original_toctree_resolve = \
+        sphinx.environment.adapters.toctree._resolve_toctree
+else:
+    original_toctree_resolve = \
+        sphinx.environment.adapters.toctree.TocTree.resolve
 
 
 def patched_toctree_resolve(self, docname, builder, toctree, *args, **kwargs):
@@ -2048,8 +2054,13 @@ def setup(app):
     rst.directives.register_directive('code', sphinx.directives.code.CodeBlock)
 
     # Monkey-patch Sphinx TocTree adapter
-    sphinx.environment.adapters.toctree.TocTree.resolve = \
-        patched_toctree_resolve
+    if hasattr(sphinx.environment.adapters.toctree, '_resolve_toctree'):
+        # Since Sphinx 7.2.0
+        sphinx.environment.adapters.toctree._resolve_toctree = \
+            patched_toctree_resolve
+    else:
+        sphinx.environment.adapters.toctree.TocTree.resolve = \
+            patched_toctree_resolve
 
     return {
         'version': __version__,