mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 20:56:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

SF patch 1631942 by Collin Winter:

Browse source 
(a) "except E, V" -> "except E as V"
(b) V is now limited to a simple name (local variable)
(c) V is now deleted at the end of the except block
This commit is contained in:
Guido van Rossum 2007-01-10 16:19:56 +00:00
parent 893523e80a
commit b940e113bf
295 changed files with 817 additions and 743 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/pydoc.py
View file

@ -1479,7 +1479,7 @@ def doc(thing, title='Python Library Documentation: %s', forceload=0):
object = type(object)
desc += ' object'
pager(title % desc + '\n\n' + text.document(object, name))
except (ImportError, ErrorDuringImport), value:
except (ImportError, ErrorDuringImport) as value:
print value
def writedoc(thing, forceload=0):
@ -1491,7 +1491,7 @@ def writedoc(thing, forceload=0):
file.write(page)
file.close()
print 'wrote', name + '.html'
except (ImportError, ErrorDuringImport), value:
except (ImportError, ErrorDuringImport) as value:
print value
def writedocs(dir, pkgpath='', done=None):
@ -1920,7 +1920,7 @@ def serve(port, callback=None, completer=None):
if path and path != '.':
try:
obj = locate(path, forceload=1)
except ErrorDuringImport, value:
except ErrorDuringImport as value:
self.send_document(path, html.escape(str(value)))
return
if obj:
@ -2223,7 +2223,7 @@ def cli():
writedoc(arg)
else:
help.help(arg)
except ErrorDuringImport, value:
except ErrorDuringImport as value:
print value
except (getopt.error, BadUsage):