Skip to content

Commit 0df3b90

Browse files
committed
singlebuilder: provide tags into get_and_resolve_doctree call
Sphinx had added a requirement for a tag parameter on its `get_and_resolve_doctree` call. If the method appears to support a tags parameter, forward the tags from the builder in. [1]: sphinx-doc/sphinx#13631 Signed-off-by: James Knight <[email protected]>
1 parent 3ca13ee commit 0df3b90

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

sphinxcontrib/confluencebuilder/singlebuilder.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from sphinxcontrib.confluencebuilder.locale import C
1414
from sphinxcontrib.confluencebuilder.logger import ConfluenceLogger as logger
1515
from typing import cast
16+
import inspect
1617

1718

1819
class SingleConfluenceBuilder(ConfluenceBuilder):
@@ -40,7 +41,13 @@ def assemble_doctree(self):
4041
tree = self._inline_all_toctrees(root_doc, tree, {root_doc}, set())
4142
tree['docname'] = root_doc
4243

43-
self.env.get_and_resolve_doctree(root_doc, self, doctree=tree)
44+
gnrdt_sig = inspect.signature(self.env.get_and_resolve_doctree)
45+
if 'tags' in gnrdt_sig.parameters:
46+
self.env.get_and_resolve_doctree(
47+
root_doc, self, tags=self.tags, doctree=tree)
48+
else:
49+
self.env.get_and_resolve_doctree(root_doc, self, doctree=tree)
50+
4451
self._fix_refuris(tree)
4552

4653
return tree

0 commit comments

Comments
 (0)