mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +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

4
Tools/pybench/CommandLine.py
View file

@ -347,7 +347,7 @@ class Application:
if rc is None:
rc = 0
except SystemExit,rc:
except SystemExit as rc:
pass
except KeyboardInterrupt:
@ -433,7 +433,7 @@ class Application:
files = l
self.optionlist = optlist
self.files = files + self.files
except getopt.error,why:
except getopt.error as why:
self.help(why)
sys.exit(1)

8
Tools/pybench/pybench.py
View file

@ -865,7 +865,7 @@ python pybench.py -s p25.pybench -c p21.pybench
bench.name = compare_to
f.close()
compare_to = bench
except IOError, reason:
except IOError as reason:
print '* Error opening/reading file %s: %s' % (
repr(compare_to),
reason)
@ -885,7 +885,7 @@ python pybench.py -s p25.pybench -c p21.pybench
else:
bench.print_benchmark(hidenoise=hidenoise,
limitnames=limitnames)
except IOError, reason:
except IOError as reason:
print '* Error opening/reading file %s: %s' % (
repr(show_bench),
reason)
@ -931,9 +931,9 @@ python pybench.py -s p25.pybench -c p21.pybench
bench.name = reportfile
pickle.dump(bench,f)
f.close()
except IOError, reason:
except IOError as reason:
print '* Error opening/writing reportfile'
except IOError, reason:
except IOError as reason:
print '* Error opening/writing reportfile %s: %s' % (
reportfile,
reason)