Skip to content

Commit b4dc4be

Browse files
committed
Trying to work around upcoming changes in Sphinx 7.2.0
1 parent 55c4809 commit b4dc4be

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/nbsphinx/__init__.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,13 @@ def handle(self, node):
14791479
node['width'], node['height'] = map(str, size)
14801480

14811481

1482-
original_toctree_resolve = sphinx.environment.adapters.toctree.TocTree.resolve
1482+
if hasattr(sphinx.environment.adapters.toctree, '_resolve_toctree'):
1483+
# Since Sphinx 7.2.0
1484+
original_toctree_resolve = \
1485+
sphinx.environment.adapters.toctree._resolve_toctree
1486+
else:
1487+
original_toctree_resolve = \
1488+
sphinx.environment.adapters.toctree.TocTree.resolve
14831489

14841490

14851491
def patched_toctree_resolve(self, docname, builder, toctree, *args, **kwargs):
@@ -2048,8 +2054,13 @@ def setup(app):
20482054
rst.directives.register_directive('code', sphinx.directives.code.CodeBlock)
20492055

20502056
# Monkey-patch Sphinx TocTree adapter
2051-
sphinx.environment.adapters.toctree.TocTree.resolve = \
2052-
patched_toctree_resolve
2057+
if hasattr(sphinx.environment.adapters.toctree, '_resolve_toctree'):
2058+
# Since Sphinx 7.2.0
2059+
sphinx.environment.adapters.toctree._resolve_toctree = \
2060+
patched_toctree_resolve
2061+
else:
2062+
sphinx.environment.adapters.toctree.TocTree.resolve = \
2063+
patched_toctree_resolve
20532064

20542065
return {
20552066
'version': __version__,

0 commit comments

Comments
 (0)