commit 74abf6f873ff8fa37f7418c97ce2f0eb27ee09b6
author Georg Brandl <georg@python.org> Sat Nov 20 19:54:36 2010 +0000
committer Georg Brandl <georg@python.org> Sat Nov 20 19:54:36 2010 +0000
tree 232c6a4f32a5240449388a49407a9e76d3494ffb
parent 5a96b5241f8ff0badd0f2a95305d551e80847f1c

#9724: add nonlocal to pydoc topics.

Lib/pydoc.py

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 9ede259..253b799 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1552,12 +1552,13 @@
         'finally': 'try',
         'for': ('for', 'break continue while'),
         'from': 'import',
-        'global': ('global', 'NAMESPACES'),
+        'global': ('global', 'nonlocal NAMESPACES'),
         'if': ('if', 'TRUTHVALUE'),
         'import': ('import', 'MODULES'),
         'in': ('in', 'SEQUENCEMETHODS'),
         'is': 'COMPARISON',
         'lambda': ('lambda', 'FUNCTIONS'),
+        'nonlocal': ('nonlocal', 'global NAMESPACES'),
         'not': 'BOOLEAN',
         'or': 'BOOLEAN',
         'pass': ('pass', ''),
@@ -1652,7 +1653,7 @@
         'NUMBERMETHODS': ('numeric-types', 'NUMBERS AUGMENTEDASSIGNMENT '
                           'SPECIALMETHODS'),
         'EXECUTION': ('execmodel', 'NAMESPACES DYNAMICFEATURES EXCEPTIONS'),
-        'NAMESPACES': ('naming', 'global ASSIGNMENT DELETION DYNAMICFEATURES'),
+        'NAMESPACES': ('naming', 'global nonlocal ASSIGNMENT DELETION DYNAMICFEATURES'),
         'DYNAMICFEATURES': ('dynamic-features', ''),
         'SCOPING': 'NAMESPACES',
         'FRAMES': 'NAMESPACES',