diff options
Diffstat (limited to 'sphinx/util/nodes.py')
| -rw-r--r-- | sphinx/util/nodes.py | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py index eb3b86b5..681046f2 100644 --- a/sphinx/util/nodes.py +++ b/sphinx/util/nodes.py @@ -10,8 +10,8 @@ """ import re -import sys +from six import text_type from docutils import nodes from sphinx import addnodes @@ -201,7 +201,7 @@ def inline_all_toctrees(builder, docnameset, docname, tree, colorfunc): tree = tree.deepcopy() for toctreenode in tree.traverse(addnodes.toctree): newnodes = [] - includefiles = map(unicode, toctreenode['includefiles']) + includefiles = map(text_type, toctreenode['includefiles']) for includefile in includefiles: try: builder.info(colorfunc(includefile) + " ", nonl=1) @@ -215,6 +215,9 @@ def inline_all_toctrees(builder, docnameset, docname, tree, colorfunc): else: sof = addnodes.start_of_file(docname=includefile) sof.children = subtree.children + for sectionnode in sof.traverse(nodes.section): + if 'docname' not in sectionnode: + sectionnode['docname'] = includefile newnodes.append(sof) toctreenode.parent.replace(toctreenode, newnodes) return tree @@ -239,12 +242,7 @@ def set_source_info(directive, node): directive.state_machine.get_source_and_line(directive.lineno) def set_role_source_info(inliner, lineno, node): - try: - node.source, node.line = \ - inliner.reporter.locator(lineno) - except AttributeError: - # docutils 0.9+ - node.source, node.line = inliner.reporter.get_source_and_line(lineno) + node.source, node.line = inliner.reporter.get_source_and_line(lineno) # monkey-patch Element.copy to copy the rawsource @@ -252,17 +250,3 @@ def _new_copy(self): return self.__class__(self.rawsource, **self.attributes) nodes.Element.copy = _new_copy - -# monkey-patch Element.__repr__ to return str if it returns unicode. -# Was fixed in docutils since 0.10. See sf.net/p/docutils/bugs/218/. - -if sys.version_info < (3,): - _element_repr_orig = nodes.Element.__repr__ - - def _new_repr(self): - s = _element_repr_orig(self) - if isinstance(s, unicode): - return s.encode('utf-8') - return s - - nodes.Element.__repr__ = _new_repr |