--- a/roundup/admin.py	Fri Jul 17 18:51:24 2009 +0000
+++ b/roundup/admin.py	Fri Jul 24 04:35:05 2009 +0000
@@ -535,7 +535,7 @@
             # 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
@@ -621,7 +621,7 @@
         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
@@ -636,13 +636,13 @@
                 try:
                     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:
                 apply(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
@@ -704,7 +704,7 @@
         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
 
@@ -742,7 +742,7 @@
         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
@@ -803,7 +803,7 @@
             try:
                 props[propname] = hyperdb.rawToHyperdb(self.db, cl, None,
                     propname, value)
-            except hyperdb.HyperdbValueError, message:
+            except hyperdb.HyperdbValueError as message:
                 raise UsageError, message
 
         # check for the key property
@@ -815,7 +815,7 @@
         # do the actual create
         try:
             print apply(cl.create, (), props)
-        except (TypeError, IndexError, ValueError), message:
+        except (TypeError, IndexError, ValueError) as message:
             raise UsageError, message
         self.db_uncommitted = True
         return 0
@@ -977,7 +977,7 @@
             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
 
         try:
@@ -1029,14 +1029,14 @@
         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)
             except KeyError:
-                raise UsageError, _('no such class "%(classname)s"')%locals()
+                raise UsageError as _('no such class "%(classname)s"')%locals()
             except IndexError:
-                raise UsageError, _('no such %(classname)s node "%(nodeid)s"')%locals()
+                raise UsageError as _('no such %(classname)s node "%(nodeid)s"')%locals()
         self.db_uncommitted = True
         return 0
 
@@ -1052,14 +1052,14 @@
         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)
             except KeyError:
-                raise UsageError, _('no such class "%(classname)s"')%locals()
+                raise UsageError as _('no such class "%(classname)s"')%locals()
             except IndexError:
-                raise UsageError, _('no such %(classname)s node "%(nodeid)s"')%locals()
+                raise UsageError as _('no such %(classname)s node "%(nodeid)s"')%locals()
         self.db_uncommitted = True
         return 0
 
@@ -1402,20 +1402,20 @@
         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
@@ -1428,7 +1428,7 @@
         ret = 0
         try:
             ret = function(args[1:])
-        except UsageError, message:
+        except UsageError as message:
             print _('Error: %(message)s')%locals()
             print
             print function.__doc__
@@ -1471,7 +1471,7 @@
     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