IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix unpack warning if combinated with 3rd party domain extensions

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-03-08 15:44:23 +09:00
parent a9ec1e1e77
commit 635c8eb417
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -9,6 +9,7 @@ Bugs fixed
Documentation Documentation
------------- -------------
* Fix unpack warning if combinated with 3rd party domain extensions.
Release 1.4 beta1 (released Mar 6, 2016) Release 1.4 beta1 (released Mar 6, 2016)
======================================== ========================================

11
sphinx/environment.py
View File

@ -1063,13 +1063,18 @@ class BuildEnvironment:
entries = self.indexentries[docname] = [] entries = self.indexentries[docname] = []
for node in document.traverse(addnodes.index): for node in document.traverse(addnodes.index):
try: try:
for type, value, tid, main, index_key in node['entries']: for entry in node['entries']:
split_index_msg(type, value) split_index_msg(entry[0], entry[1])
except ValueError as exc: except ValueError as exc:
self.warn_node(exc, node) self.warn_node(exc, node)
node.parent.remove(node) node.parent.remove(node)
else: else:
entries.extend(node['entries']) for entry in node['entries']:
if len(entry) == 5:
# Since 1.4: new index structure including index_key (5th column)
entries.append(entry)
else:
entries.append(entry + (None,))
def note_citations_from(self, docname, document): def note_citations_from(self, docname, document):
for node in document.traverse(nodes.citation): for node in document.traverse(nodes.citation):