[Python-checkins] r66076 - python/trunk/Lib/pydoc.py

[georg.brandl]

Author: georg.brandl
Date: Sat Aug 30 21:03:43 2008
New Revision: 66076

Log:
#3707: fix inf. recursion in pydoc topic search. Rev'd by Antoine.


Modified:
   python/trunk/Lib/pydoc.py

Modified: python/trunk/Lib/pydoc.py
==============================================================================
--- python/trunk/Lib/pydoc.py	(original)
+++ python/trunk/Lib/pydoc.py	Sat Aug 30 21:03:43 2008
@@ -1552,11 +1552,11 @@
         'del': ('del', 'BASICMETHODS'),
         'elif': 'if',
         'else': ('else', 'while for'),
-        'except': 'except',
+        'except': 'try',
         'exec': ('exec', ''),
-        'finally': 'finally',
+        'finally': 'try',
         'for': ('for', 'break continue while'),
-        'from': 'from',
+        'from': 'import',
         'global': ('global', 'NAMESPACES'),
         'if': ('if', 'TRUTHVALUE'),
         'import': ('import', 'MODULES'),