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/faqwiz/faqw.py b/Tools/faqwiz/faqw.py
index a26e0d6..06db125 100755
--- a/Tools/faqwiz/faqw.py
+++ b/Tools/faqwiz/faqw.py
@@ -24,7 +24,7 @@
os.chdir(FAQDIR)
sys.path.insert(0, SRCDIR)
import faqwiz
-except SystemExit, n:
+except SystemExit as n:
sys.exit(n)
except:
t, v, tb = sys.exc_info()
diff --git a/Tools/faqwiz/faqwiz.py b/Tools/faqwiz/faqwiz.py
index bdd270c..d8b8cd5 100644
--- a/Tools/faqwiz/faqwiz.py
+++ b/Tools/faqwiz/faqwiz.py
@@ -348,7 +348,7 @@
raise InvalidFile(file)
try:
fp = open(file)
- except IOError, msg:
+ except IOError as msg:
raise NoSuchFile(file, msg)
try:
return self.entryclass(fp, file, sec_num)
@@ -387,11 +387,11 @@
else:
try:
meth()
- except InvalidFile, exc:
+ except InvalidFile as exc:
self.error("Invalid entry file name %s" % exc.file)
- except NoSuchFile, exc:
+ except NoSuchFile as exc:
self.error("No entry with file name %s" % exc.file)
- except NoSuchSection, exc:
+ except NoSuchSection as exc:
self.error("No section number %s" % exc.section)
self.epilogue()
@@ -796,7 +796,7 @@
pass
try:
f = open(file, 'w')
- except IOError, why:
+ except IOError as why:
self.error(CANTWRITE, file=file, why=why)
return
date = time.ctime(now)