SF patch 1631942 by Collin Winter:

(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

View file

@ -18,11 +18,11 @@ def compare_codecs(encoding1, encoding2):
u = unichr(i)
try:
c1 = u.encode(encoding1)
except UnicodeError, reason:
except UnicodeError as reason:
c1 = '<undefined>'
try:
c2 = u.encode(encoding2)
except UnicodeError, reason:
except UnicodeError as reason:
c2 = '<undefined>'
if c1 != c2:
print ' * encoding mismatch for 0x%04X: %-14r != %r' % \

View file

@ -130,7 +130,7 @@ def hexrepr(t, precision=4):
try:
return '(' + ', '.join(['0x%0*X' % (precision, item)
for item in t]) + ')'
except TypeError, why:
except TypeError as why:
print '* failed to convert %r: %s' % (t, why)
raise
@ -393,7 +393,7 @@ def convertdir(dir, dirprefix='', nameprefix='', comments=1):
else:
pymap(mappathname, map, dirprefix + codefile,name,comments)
marshalmap(mappathname, map, dirprefix + marshalfile)
except ValueError, why:
except ValueError as why:
print '* conversion failed: %s' % why
raise
@ -414,7 +414,7 @@ def rewritepythondir(dir, dirprefix='', comments=1):
print '* map is empty; skipping'
else:
pymap(mapname, map, dirprefix + codefile,name,comments)
except ValueError, why:
except ValueError as why:
print '* conversion failed: %s' % why
if __name__ == '__main__':

View file

@ -22,7 +22,7 @@ def listcodecs(dir):
except LookupError:
# Codec not found
continue
except Exception, reason:
except Exception as reason:
# Probably an error from importing the codec; still it's
# a valid code name
if _debug: