summaryrefslogtreecommitdiffstats
path: root/Doc/tools/sphinxext
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-07-31 08:27:46 (GMT)
committerGeorg Brandl <georg@python.org>2010-07-31 08:27:46 (GMT)
commit80ff2adf88e80e076774f03c7dd58e681bb08255 (patch)
tree5026bb79c6e737d6779e08bdcaff73a470587706 /Doc/tools/sphinxext
parent604ef370b329231bd0f1e7a7e69754cb9a2e67af (diff)
downloadcpython-80ff2adf88e80e076774f03c7dd58e681bb08255.zip
cpython-80ff2adf88e80e076774f03c7dd58e681bb08255.tar.gz
cpython-80ff2adf88e80e076774f03c7dd58e681bb08255.tar.bz2
Update pydoc topics and adapt Topics builder to Sphinx 1.0.
Diffstat (limited to 'Doc/tools/sphinxext')
-rw-r--r--Doc/tools/sphinxext/pyspecific.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 5ee35b0..d02cd46 100644
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -145,10 +145,10 @@ class PydocTopicsBuilder(Builder):
for label in self.status_iterator(pydoc_topic_labels,
'building topics... ',
length=len(pydoc_topic_labels)):
- if label not in self.env.labels:
+ if label not in self.env.domaindata['std']['labels']:
self.warn('label %r not in documentation' % label)
continue
- docname, labelid, sectname = self.env.labels[label]
+ docname, labelid, sectname = self.env.domaindata['std']['labels'][label]
doctree = self.env.get_and_resolve_doctree(docname, self)
document = new_document('<section node>')
document.append(doctree.ids[labelid])