diff options
| author | Georg Brandl <georg@python.org> | 2008-08-30 19:53:05 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-08-30 19:53:05 (GMT) |
| commit | 0d855393e61496e0690514c0cf7437f92f5a04e8 (patch) | |
| tree | 1c8dadafebd6b006213dc54970cb65a930a5e32e | |
| parent | 069094bc00e7be518c2e4c469c7e3ff3e21d8fb3 (diff) | |
| download | cpython-0d855393e61496e0690514c0cf7437f92f5a04e8.zip cpython-0d855393e61496e0690514c0cf7437f92f5a04e8.tar.gz cpython-0d855393e61496e0690514c0cf7437f92f5a04e8.tar.bz2 | |
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.
........
| -rwxr-xr-x | Lib/pydoc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 09e1d25..b334333 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'), |