[Python-checkins] r86608 - python/branches/py3k/Lib/pydoc.py

Sat Nov 20 20:54:37 CET 2010

Author: georg.brandl
Date: Sat Nov 20 20:54:36 2010
New Revision: 86608
Log:
#9724: add nonlocal to pydoc topics.
Modified:
 python/branches/py3k/Lib/pydoc.py
Modified: python/branches/py3k/Lib/pydoc.py
==============================================================================

--- python/branches/py3k/Lib/pydoc.py	(original)
+++ python/branches/py3k/Lib/pydoc.py	Sat Nov 20 20:54:36 2010
@@ -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',
