Use Python-3-compatible 'as' syntax for except statements

Many raise statements near these are also fixed.
So are two ivorrect file encoding marks ('utf8'->'utf-8').

Author: eric-s-raymond

detectors/newissuecopy.py

@@ -18,8 +18,8 @@ def newissuecopy(db, cl, nodeid, oldvalues):
             cl.send_message(nodeid, msgid, change_note,
                             ['[email protected]'],
                             crypt=encrypt)
-        except roundupdb.MessageSendError, message:
-            raise roundupdb.DetectorError, message
+        except roundupdb.MessageSendError as message:
+            raise roundupdb.DetectorError(message)
 
 def init(db):
     db.issue.react('create', newissuecopy)

detectors/newitemcopy.py

@@ -71,8 +71,8 @@ def newitemcopy(db, cl, nodeid, oldvalues):
         for msgid in msgids:
             try:
                 cl.send_message(nodeid, msgid, create_note, [dispatcher_email])
-            except roundupdb.MessageSendError, message:
-                raise roundupdb.DetectorError, message
+            except roundupdb.MessageSendError as message:
+                raise roundupdb.DetectorError(message)
     else:
         mailer = Mailer(db.config)
         subject = 'New %s%s' % (cl.classname, nodeid)

doc/customizing.txt

@@ -4473,8 +4473,8 @@ vacation". Not very useful, and relatively easy to stop.
 
                     # send the message
                     cl.send_message(nodeid, msgid, note, sendto)
-            except roundupdb.MessageSendError, message:
-                raise roundupdb.DetectorError, message
+            except roundupdb.MessageSendError as message:
+                raise roundupdb.DetectorError(message)
 
    Note that this is the standard nosy reaction code, with the small
    addition of::
@@ -4925,9 +4925,9 @@ directory of your tracker::
 	   return
 
        # otherwise raise an error
-       raise Unauthorized, \
+       raise Unauthorized( \
 	   'Changes to nosy property not allowed via %s for this issue.'%\
-           tx_Source
+           tx_Source)
 
    def init(db):
       ''' Install restrict_nosy_changes to run after other auditors. 

doc/xmlrpc.txt

@@ -174,5 +174,5 @@ https, replace xmlrpclib.SafeTransport with xmlrpclib.Transport::
    # this will fail with a fault
    try:
       print roundup_server.filter('usr',['0','2','3'],{'username':'demo'})
-   except Exception, msg:
+   except Exception as msg:
       print msg

roundup/admin.py

@@ -558,7 +558,7 @@ def do_get(self, args):
             # decode the node designator
             try:
                 classname, nodeid = hyperdb.splitDesignator(designator)
-            except hyperdb.DesignatorError, message:
+            except hyperdb.DesignatorError as message:
                 raise UsageError(message)
 
             # get the class
@@ -654,7 +654,7 @@ def do_set(self, args):
         else:
             try:
                 designators = [hyperdb.splitDesignator(x) for x in designators]
-            except hyperdb.DesignatorError, message:
+            except hyperdb.DesignatorError as message:
                 raise UsageError(message)
 
         # get the props from the args
@@ -675,13 +675,13 @@ def do_set(self, args):
                     # designators if not reinitalized.
                     props[key] = hyperdb.rawToHyperdb(self.db, cl, itemid,
                         key, value)
-                except hyperdb.HyperdbValueError, message:
+                except hyperdb.HyperdbValueError as message:
                     raise UsageError(message)
 
             # try the set
             try:
                 cl.set(itemid, **props)
-            except (TypeError, IndexError, ValueError), message:
+            except (TypeError, IndexError, ValueError) as message:
                 import traceback; traceback.print_exc()
                 raise UsageError(message)
         self.db_uncommitted = True
@@ -743,7 +743,7 @@ def do_find(self, args):
         except KeyError:
             raise UsageError(_('%(classname)s has no property '
                 '"%(propname)s"')%locals())
-        except (ValueError, TypeError), message:
+        except (ValueError, TypeError) as message:
             raise UsageError(message)
         return 0
 
@@ -785,7 +785,7 @@ def do_display(self, args):
         for designator in args[0].split(','):
             try:
                 classname, nodeid = hyperdb.splitDesignator(designator)
-            except hyperdb.DesignatorError, message:
+            except hyperdb.DesignatorError as message:
                 raise UsageError(message)
 
             # get the class
@@ -846,7 +846,7 @@ def do_create(self, args):
             try:
                 props[propname] = hyperdb.rawToHyperdb(self.db, cl, None,
                     propname, props[propname])
-            except hyperdb.HyperdbValueError, message:
+            except hyperdb.HyperdbValueError as message:
                 raise UsageError(message)
 
         # check for the key property
@@ -858,7 +858,7 @@ def do_create(self, args):
         # do the actual create
         try:
             sys.stdout.write(cl.create(**props) + '\n')
-        except (TypeError, IndexError, ValueError), message:
+        except (TypeError, IndexError, ValueError) as message:
             raise UsageError(message)
         self.db_uncommitted = True
         return 0
@@ -1028,7 +1028,7 @@ def do_history(self, args):
             raise UsageError(_('Not enough arguments supplied'))
         try:
             classname, nodeid = hyperdb.splitDesignator(args[0])
-        except hyperdb.DesignatorError, message:
+        except hyperdb.DesignatorError as message:
             raise UsageError(message)
 
         skipquiet = False
@@ -1091,7 +1091,7 @@ def do_retire(self, args):
         for designator in designators:
             try:
                 classname, nodeid = hyperdb.splitDesignator(designator)
-            except hyperdb.DesignatorError, message:
+            except hyperdb.DesignatorError as message:
                 raise UsageError(message)
             try:
                 self.db.getclass(classname).retire(nodeid)
@@ -1118,7 +1118,7 @@ def do_restore(self, args):
         for designator in designators:
             try:
                 classname, nodeid = hyperdb.splitDesignator(designator)
-            except hyperdb.DesignatorError, message:
+            except hyperdb.DesignatorError as message:
                 raise UsageError(message)
             try:
                 self.db.getclass(classname).restore(nodeid)
@@ -1495,24 +1495,24 @@ def run_command(self, args):
         if command == 'initialise':
             try:
                 return self.do_initialise(self.tracker_home, args)
-            except UsageError, message:
+            except UsageError as message:
                 print _('Error: %(message)s')%locals()
                 return 1
         elif command == 'install':
             try:
                 return self.do_install(self.tracker_home, args)
-            except UsageError, message:
+            except UsageError as message:
                 print _('Error: %(message)s')%locals()
                 return 1
 
         # get the tracker
         try:
             tracker = roundup.instance.open(self.tracker_home)
-        except ValueError, message:
+        except ValueError as message:
             self.tracker_home = ''
             print _("Error: Couldn't open tracker: %(message)s")%locals()
             return 1
-        except NoConfigError, message:
+        except NoConfigError as message:
             self.tracker_home = ''
             print _("Error: Couldn't open tracker: %(message)s")%locals()
             return 1
@@ -1527,7 +1527,7 @@ def run_command(self, args):
         ret = 0
         try:
             ret = function(args[1:])
-        except UsageError, message:
+        except UsageError as message:
             print _('Error: %(message)s')%locals()
             print
             print function.__doc__
@@ -1573,7 +1573,7 @@ def interactive(self):
     def main(self):
         try:
             opts, args = getopt.getopt(sys.argv[1:], 'i:u:hcdsS:vV')
-        except getopt.GetoptError, e:
+        except getopt.GetoptError as e:
             self.usage(str(e))
             return 1
 

roundup/backends/__init__.py

@@ -48,7 +48,7 @@ def have_backend(name):
     try:
         get_backend(name)
         return 1
-    except ImportError, e:
+    except ImportError as e:
         for name in _modules.get(name, (name,)):
             if str(e).startswith('No module named %s'%name):
                 return 0

roundup/backends/back_anydbm.py

@@ -633,7 +633,7 @@ def getjournal(self, classname, nodeid):
         # not exist
         try:
             db = self.opendb('journals.%s'%classname, 'r')
-        except anydbm.error, error:
+        except anydbm.error as error:
             if str(error) == "need 'c' or 'n' flag to open new db":
                 raise IndexError('no such %s %s'%(classname, nodeid))
             elif error.args[0] != 2:
@@ -2183,7 +2183,7 @@ def get(self, nodeid, propname, default=_marker, cache=1):
         if propname == 'content':
             try:
                 return self.db.getfile(self.classname, nodeid, None)
-            except IOError, strerror:
+            except IOError as strerror:
                 # XXX by catching this we don't see an error in the log.
                 return 'ERROR reading file: %s%s\n%s\n%s'%(
                         self.classname, nodeid, poss_msg, strerror)

roundup/backends/back_mysql.py

@@ -161,8 +161,8 @@ def sql_open_connection(self):
         self.log_info('open database %r'%(kwargs['db'],))
         try:
             conn = MySQLdb.connect(**kwargs)
-        except MySQLdb.OperationalError, message:
-            raise hyperdb.DatabaseError, message
+        except MySQLdb.OperationalError as message:
+            raise hyperdb.DatabaseError(message)
         cursor = conn.cursor()
         cursor.execute("SET AUTOCOMMIT=0")
         lvl = isolation_levels [self.config.RDBMS_ISOLATION_LEVEL]
@@ -179,10 +179,10 @@ def open_connection(self):
 
         try:
             self.load_dbschema()
-        except MySQLdb.OperationalError, message:
+        except MySQLdb.OperationalError as message:
             if message[0] != ER.NO_DB_ERROR:
                 raise
-        except MySQLdb.ProgrammingError, message:
+        except MySQLdb.ProgrammingError as message:
             if message[0] != ER.NO_SUCH_TABLE:
                 raise hyperdb.DatabaseError, message
             self.init_dbschema()
@@ -583,7 +583,7 @@ def sql_close(self):
         self.log_info('close')
         try:
             self.conn.close()
-        except MySQLdb.ProgrammingError, message:
+        except MySQLdb.ProgrammingError as message:
             if str(message) != 'closing a closed connection':
                 raise
 
@@ -604,14 +604,14 @@ def _subselect(self, classname, multilink_table):
     def create_inner(self, **propvalues):
         try:
             return rdbms_common.Class.create_inner(self, **propvalues)
-        except MySQLdb.IntegrityError, e:
+        except MySQLdb.IntegrityError as e:
             self._handle_integrity_error(e, propvalues)
 
     def set_inner(self, nodeid, **propvalues):
         try:
             return rdbms_common.Class.set_inner(self, nodeid,
                                                 **propvalues)
-        except MySQLdb.IntegrityError, e:
+        except MySQLdb.IntegrityError as e:
             self._handle_integrity_error(e, propvalues)
 
     def _handle_integrity_error(self, e, propvalues):

roundup/backends/back_postgresql.py

@@ -74,7 +74,7 @@ def db_command(config, command, database='postgres'):
 
     try:
         conn = psycopg.connect(**template1)
-    except psycopg.OperationalError, message:
+    except psycopg.OperationalError as message:
         if str(message).find('database "postgres" does not exist') >= 0:
             return db_command(config, command, database='template1')
         raise hyperdb.DatabaseError(message)
@@ -97,7 +97,7 @@ def pg_command(cursor, command):
     '''
     try:
         cursor.execute(command)
-    except psycopg.DatabaseError, err:
+    except psycopg.DatabaseError as err:
         response = str(err).split('\n')[0]
         if "FATAL" not in response :
             msgs = (
@@ -125,7 +125,7 @@ class Sessions(sessions_rdbms.Sessions):
     def set(self, *args, **kwargs):
         try:
             sessions_rdbms.Sessions.set(self, *args, **kwargs)
-        except ProgrammingError, err:
+        except ProgrammingError as err:
             response = str(err).split('\n')[0]
             if -1 != response.find('ERROR') and \
                -1 != response.find('could not serialize access due to concurrent update'):
@@ -160,7 +160,7 @@ def sql_open_connection(self):
             'open database %r'%db['database'])
         try:
             conn = psycopg.connect(**db)
-        except psycopg.OperationalError, message:
+        except psycopg.OperationalError as message:
             raise hyperdb.DatabaseError(message)
 
         cursor = conn.cursor()
@@ -178,7 +178,7 @@ def open_connection(self):
 
         try:
             self.load_dbschema()
-        except ProgrammingError, message:
+        except ProgrammingError as message:
             if str(message).find('schema') == -1:
                 raise
             self.rollback()
@@ -251,7 +251,7 @@ def sql_commit(self, fail_ok=False):
 
         try:
             self.conn.commit()
-        except ProgrammingError, message:
+        except ProgrammingError as message:
             # we've been instructed that this commit is allowed to fail
             if fail_ok and str(message).endswith('could not serialize '
                     'access due to concurrent update'):

roundup/backends/back_sqlite.py

@@ -147,7 +147,7 @@ def open_connection(self):
 
         try:
             self.load_dbschema()
-        except sqlite.DatabaseError, error:
+        except sqlite.DatabaseError as error:
             if str(error) != 'no such table: schema':
                 raise
             self.init_dbschema()
@@ -332,7 +332,7 @@ def sql_close(self):
         """
         try:
             self.conn.close()
-        except sqlite.ProgrammingError, value:
+        except sqlite.ProgrammingError as value:
             if str(value) != 'close failed - Connection is closed.':
                 raise
 
@@ -342,7 +342,7 @@ def sql_rollback(self):
         """
         try:
             self.conn.rollback()
-        except sqlite.ProgrammingError, value:
+        except sqlite.ProgrammingError as value:
             if str(value) != 'rollback failed - Connection is closed.':
                 raise
 
@@ -356,7 +356,7 @@ def sql_commit(self, fail_ok=False):
         """
         try:
             self.conn.commit()
-        except sqlite.DatabaseError, error:
+        except sqlite.DatabaseError as error:
             if str(error) != 'cannot commit - no transaction is active':
                 raise
         # open a new cursor for subsequent work