[Checkins] SVN: zope.tal/trunk/src/zope/tal/ Towards Py3K: use "except ... as ..."

[Marius Gedminas]

Log message for revision 129171:
  Towards Py3K: use "except ... as ..."

Changed:
  U   zope.tal/trunk/src/zope/tal/driver.py
  U   zope.tal/trunk/src/zope/tal/htmltalparser.py
  U   zope.tal/trunk/src/zope/tal/ndiff.py
  U   zope.tal/trunk/src/zope/tal/talgenerator.py
  U   zope.tal/trunk/src/zope/tal/talgettext.py
  U   zope.tal/trunk/src/zope/tal/tests/markbench.py
  U   zope.tal/trunk/src/zope/tal/tests/test_files.py
  U   zope.tal/trunk/src/zope/tal/timer.py

-=-
Modified: zope.tal/trunk/src/zope/tal/driver.py
===================================================================
--- zope.tal/trunk/src/zope/tal/driver.py	2013-02-07 13:18:36 UTC (rev 129170)
+++ zope.tal/trunk/src/zope/tal/driver.py	2013-02-07 16:02:46 UTC (rev 129171)
@@ -120,7 +120,7 @@
     try:
         opts, args = getopt.getopt(sys.argv[1:], "hHxlmstia",
                                    ['help', 'html', 'xml'])
-    except getopt.error, msg:
+    except getopt.error as msg:
         usage(2, msg)
     for opt, arg in opts:
         if opt in ('-h', '--help'):

Modified: zope.tal/trunk/src/zope/tal/htmltalparser.py
===================================================================
--- zope.tal/trunk/src/zope/tal/htmltalparser.py	2013-02-07 13:18:36 UTC (rev 129170)
+++ zope.tal/trunk/src/zope/tal/htmltalparser.py	2013-02-07 16:02:46 UTC (rev 129171)
@@ -118,7 +118,7 @@
         f.close()
         try:
             self.parseString(data)
-        except TALError, e:
+        except TALError as e:
             e.setFile(file)
             raise
 

Modified: zope.tal/trunk/src/zope/tal/ndiff.py
===================================================================
--- zope.tal/trunk/src/zope/tal/ndiff.py	2013-02-07 13:18:36 UTC (rev 129170)
+++ zope.tal/trunk/src/zope/tal/ndiff.py	2013-02-07 16:02:46 UTC (rev 129171)
@@ -562,7 +562,7 @@
 def fopen(fname):
     try:
         return open(fname, 'r')
-    except IOError, detail:
+    except IOError as detail:
         return fail("couldn't open " + fname + ": " + str(detail))
 
 # open two files & spray the diff to stdout; return false iff a problem
@@ -597,7 +597,7 @@
     import getopt
     try:
         opts, args = getopt.getopt(args, "qr:")
-    except getopt.error, detail:
+    except getopt.error as detail:
         return fail(str(detail))
     noisy = 1
     qseen = rseen = 0

Modified: zope.tal/trunk/src/zope/tal/talgenerator.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talgenerator.py	2013-02-07 13:18:36 UTC (rev 129170)
+++ zope.tal/trunk/src/zope/tal/talgenerator.py	2013-02-07 16:02:46 UTC (rev 129171)
@@ -197,7 +197,7 @@
     def compileExpression(self, expr):
         try:
             return self.expressionCompiler.compile(expr)
-        except self.CompilerError, err:
+        except self.CompilerError as err:
             raise TALError('%s in expression %s' % (err.args[0], `expr`),
                            self.position)
 

Modified: zope.tal/trunk/src/zope/tal/talgettext.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talgettext.py	2013-02-07 13:18:36 UTC (rev 129170)
+++ zope.tal/trunk/src/zope/tal/talgettext.py	2013-02-07 16:02:46 UTC (rev 129171)
@@ -170,7 +170,7 @@
 
         try:
             lines = open(self._filename).readlines()
-        except IOError, msg:
+        except IOError as msg:
             print >> sys.stderr, msg
             sys.exit(1)
 
@@ -243,7 +243,7 @@
             sys.argv[1:],
             'ho:u:',
             ['help', 'output=', 'update='])
-    except getopt.error, msg:
+    except getopt.error as msg:
         usage(1, msg)
 
     outfile = None

Modified: zope.tal/trunk/src/zope/tal/tests/markbench.py
===================================================================
--- zope.tal/trunk/src/zope/tal/tests/markbench.py	2013-02-07 13:18:36 UTC (rev 129170)
+++ zope.tal/trunk/src/zope/tal/tests/markbench.py	2013-02-07 16:02:46 UTC (rev 129171)
@@ -180,6 +180,6 @@
         p.sort_stats('time', 'calls')
         try:
             p.print_stats(20)
-        except IOError, e:
+        except IOError as e:
             if e.errno != errno.EPIPE:
                 raise

Modified: zope.tal/trunk/src/zope/tal/tests/test_files.py
===================================================================
--- zope.tal/trunk/src/zope/tal/tests/test_files.py	2013-02-07 13:18:36 UTC (rev 129170)
+++ zope.tal/trunk/src/zope/tal/tests/test_files.py	2013-02-07 16:02:46 UTC (rev 129171)
@@ -53,7 +53,7 @@
                 zope.tal.runtest.main()
             finally:
                 os.chdir(pwd)
-        except SystemExit, what:
+        except SystemExit as what:
             if what.code:
                 self.fail("output for %s didn't match" % self.__file)
 

Modified: zope.tal/trunk/src/zope/tal/timer.py
===================================================================
--- zope.tal/trunk/src/zope/tal/timer.py	2013-02-07 13:18:36 UTC (rev 129170)
+++ zope.tal/trunk/src/zope/tal/timer.py	2013-02-07 16:02:46 UTC (rev 129171)
@@ -27,7 +27,7 @@
     count = 10
     try:
         opts, args = getopt.getopt(sys.argv[1:], "n:")
-    except getopt.error, msg:
+    except getopt.error as msg:
         print msg
         sys.exit(2)
     for o, a in opts: