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/Demo/pysvr/pysvr.py b/Demo/pysvr/pysvr.py
index 3b692b3..b1b7565 100755
--- a/Demo/pysvr/pysvr.py
+++ b/Demo/pysvr/pysvr.py
@@ -21,14 +21,14 @@
opts, args = getopt.getopt(sys.argv[1:], "")
if len(args) > 1:
raise getopt.error, "Too many arguments."
- except getopt.error, msg:
+ except getopt.error as msg:
usage(msg)
for o, a in opts:
pass
if args:
try:
port = string.atoi(args[0])
- except ValueError, msg:
+ except ValueError as msg:
usage(msg)
else:
port = PORT
@@ -83,7 +83,7 @@
source = source + line
try:
code = compile_command(source)
- except SyntaxError, err:
+ except SyntaxError as err:
source = ""
traceback.print_exception(SyntaxError, err, None, file=stdout)
continue
@@ -92,7 +92,7 @@
source = ""
try:
run_command(code, stdin, stdout, globals)
- except SystemExit, how:
+ except SystemExit as how:
if how:
try:
how = str(how)
@@ -109,7 +109,7 @@
sys.stdin = stdin
try:
exec(code, globals)
- except SystemExit, how:
+ except SystemExit as how:
raise SystemExit, how, sys.exc_info()[2]
except:
type, value, tb = sys.exc_info()