summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-08-30 19:03:43 (GMT)
committerGeorg Brandl <georg@python.org>2008-08-30 19:03:43 (GMT)
commit5c669db194e6fd1d9eae11b4c0ba268faeeb460d (patch)
tree2e030db20f6e02e765a6ab155a0a8233c702aec3 /Lib
parent5f2dc0bf7b2d7d77bbb080d0deb3da80910bfb29 (diff)
downloadcpython-5c669db194e6fd1d9eae11b4c0ba268faeeb460d.zip
cpython-5c669db194e6fd1d9eae11b4c0ba268faeeb460d.tar.gz
cpython-5c669db194e6fd1d9eae11b4c0ba268faeeb460d.tar.bz2
#3707: fix inf. recursion in pydoc topic search. Rev'd by Antoine.
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/pydoc.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 21af320..179026b 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'),