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 09e1d256c251c4f068b30a4abc35527eb2a79740..b334333050a771442c93e21889e7c46fbeb78fd7 100755 (executable)
--- 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'),