summaryrefslogtreecommitdiffstats
path: root/Doc/tools
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-08-31 14:32:27 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-08-31 14:32:27 (GMT)
commit2f40d7d472c9d986e2d4f2ae562e8687ac29a9af (patch)
tree0d9d22eb70db4ad3b23b61a27abb64e1267e4eac /Doc/tools
parent48fd2a6a738ef05465576cd1ffe776ab5928f3b2 (diff)
downloadcpython-2f40d7d472c9d986e2d4f2ae562e8687ac29a9af.zip
cpython-2f40d7d472c9d986e2d4f2ae562e8687ac29a9af.tar.gz
cpython-2f40d7d472c9d986e2d4f2ae562e8687ac29a9af.tar.bz2
Merged revisions 84376 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84376 | benjamin.peterson | 2010-08-31 09:31:01 -0500 (Tue, 31 Aug 2010) | 1 line add nonlocal to pydoc topics #9724 ........
Diffstat (limited to 'Doc/tools')
-rw-r--r--Doc/tools/sphinxext/pyspecific.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 85cd5bc..143003f 100644
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -84,12 +84,12 @@ pydoc_topic_labels = [
'del', 'dict', 'dynamic-features', 'else', 'exceptions', 'execmodel',
'exprlists', 'floating', 'for', 'formatstrings', 'function', 'global',
'id-classes', 'identifiers', 'if', 'imaginary', 'import', 'in', 'integers',
- 'lambda', 'lists', 'naming', 'numbers', 'numeric-types', 'objects',
- 'operator-summary', 'pass', 'power', 'raise', 'return', 'sequence-types',
- 'shifting', 'slicings', 'specialattrs', 'specialnames', 'string-methods',
- 'strings', 'subscriptions', 'truth', 'try', 'types', 'typesfunctions',
- 'typesmapping', 'typesmethods', 'typesmodules', 'typesseq',
- 'typesseq-mutable', 'unary', 'while', 'with', 'yield'
+ 'lambda', 'lists', 'naming', 'nonlocal', 'numbers', 'numeric-types',
+ 'objects', 'operator-summary', 'pass', 'power', 'raise', 'return',
+ 'sequence-types', 'shifting', 'slicings', 'specialattrs', 'specialnames',
+ 'string-methods', 'strings', 'subscriptions', 'truth', 'try', 'types',
+ 'typesfunctions', 'typesmapping', 'typesmethods', 'typesmodules',
+ 'typesseq', 'typesseq-mutable', 'unary', 'while', 'with', 'yield'
]
from os import path