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
diff --git a/Tools/pybench/CommandLine.py b/Tools/pybench/CommandLine.py
index 6601be5..ddf958d 100644
--- a/Tools/pybench/CommandLine.py
+++ b/Tools/pybench/CommandLine.py
@@ -347,7 +347,7 @@
if rc is None:
rc = 0
- except SystemExit,rc:
+ except SystemExit as rc:
pass
except KeyboardInterrupt:
@@ -433,7 +433,7 @@
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)
diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py
index 392ff50..e0ff732 100755
--- a/Tools/pybench/pybench.py
+++ b/Tools/pybench/pybench.py
@@ -865,7 +865,7 @@
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 @@
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 @@
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)