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.
........
This commit is contained in:
Georg Brandl 2008-08-30 19:53:05 +00:00
parent 069094bc00
commit 0d855393e6
1 changed files with 3 additions and 3 deletions

View File

@ -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'),