From: Georg Brandl <georg@python.org> Date: Sat, 30 Aug 2008 19:53:05 +0000 (+0000) Subject: Merged revisions 66076 via svnmerge from X-Git-Tag: v3.0rc1~153 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d855393e61496e0690514c0cf7437f92f5a04e8;p=python Merged revisions 66076 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r66076 | georg.brandl | 2008-08-30 21:03:43 +0200 (Sat, 30 Aug 2008) | 2 lines #3707: fix inf. recursion in pydoc topic search. Rev'd by Antoine. ........ --- diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 09e1d256c2..b334333050 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1548,10 +1548,10 @@ class Helper: 'del': ('del', 'BASICMETHODS'), 'elif': 'if', 'else': ('else', 'while for'), - 'except': 'except', - 'finally': 'finally', + 'except': 'try', + 'finally': 'try', 'for': ('for', 'break continue while'), - 'from': 'from', + 'from': 'import', 'global': ('global', 'NAMESPACES'), 'if': ('if', 'TRUTHVALUE'), 'import': ('import', 'MODULES'),