From: Georg Brandl <georg@python.org>
Date: Sat, 30 Aug 2008 19:03:43 +0000 (+0000)
Subject: #3707: fix inf. recursion in pydoc topic search. Rev'd by Antoine.
X-Git-Tag: v2.6rc1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c669db194e6fd1d9eae11b4c0ba268faeeb460d;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 21af32092914..179026b051ce 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1552,11 +1552,11 @@ class Helper:
         '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'),