[Python-3000-checkins] r66078 - in python/branches/py3k: Lib/pydoc.py

[georg.brandl]

Author: georg.brandl
Date: Sat Aug 30 21:53:05 2008
New Revision: 66078

Log:
Merged revisions 66076 via svnmerge from
svn+ssh://pythondev at 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.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/pydoc.py

Modified: python/branches/py3k/Lib/pydoc.py
==============================================================================
--- python/branches/py3k/Lib/pydoc.py (original)
+++ python/branches/py3k/Lib/pydoc.py Sat Aug 30 21:53:05 2008
@@ -1548,10 +1548,10 @@
'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'),