[FIX] _extension: complete monkeypatch in sphinx 1.6

The monkey patch made for sphinx 1.6 was not complete. In comparison
to the one done for previous versions (resolve_toctree), navbarify was
not called.

In the toctree, the sub-levels were turned into a link in 1.6 while
navbarify prevents this.
This commit is contained in:
Martin Trigaux 2019-11-05 15:02:06 +01:00
parent 2ca5c635b9
commit f7cb30b6d8

View File

@ -111,7 +111,13 @@ if toctree:
def resolve(old_resolve, tree, docname, *args, **kwargs):
if docname == tree.env.config.master_doc:
return resolve_content_toctree(tree.env, docname, *args, **kwargs)
return old_resolve(tree, docname, *args, **kwargs)
toc = old_resolve(tree, docname, *args, **kwargs)
if toc is None:
return None
navbarify(toc[0], navbar=kwargs.pop('navbar', None))
return toc
@monkey(sphinx.environment.BuildEnvironment)
def resolve_toctree(old_resolve, self, docname, *args, **kwargs):