--- a/roundup/hyperdb.py	Fri Jul 17 18:51:24 2009 +0000
+++ b/roundup/hyperdb.py	Fri Jul 24 04:35:05 2009 +0000
@@ -86,7 +86,7 @@
         else:
             try:
                 value = password.Password(value)
-            except password.PasswordValueError, message:
+            except password.PasswordValueError as message:
                 raise HyperdbValueError, \
                         _('property %s: %s')%(kw['propname'], message)
         return value
@@ -107,7 +107,7 @@
     def from_raw(self, value, db, **kw):
         try:
             value = date.Date(value, self.offset(db))
-        except ValueError, message:
+        except ValueError as message:
             raise HyperdbValueError, _('property %s: %r is an invalid '\
                 'date (%s)')%(kw['propname'], value, message)
         return value
@@ -124,7 +124,7 @@
     def from_raw(self, value, **kw):
         try:
             value = date.Interval(value)
-        except ValueError, message:
+        except ValueError as message:
             raise HyperdbValueError, _('property %s: %r is an invalid '\
                 'date interval (%s)')%(kw['propname'], value, message)
         return value
@@ -1091,7 +1091,7 @@
         for k in propname_path.split('.'):
             try:
                 prop = props[k]
-            except KeyError, TypeError:
+            except KeyError as TypeError:
                 return default
             cl = getattr(prop, 'classname', None)
             props = None
@@ -1240,7 +1240,7 @@
         if linkcl.getkey():
             try:
                 value = linkcl.lookup(value)
-            except KeyError, message:
+            except KeyError as message:
                 raise HyperdbValueError, _('property %s: %r is not a %s.')%(
                     propname, value, prop.classname)
         else:
@@ -1370,7 +1370,7 @@
             return self.__dict__[name]
         try:
             return self.cl.get(self.nodeid, name)
-        except KeyError, value:
+        except KeyError as value:
             # we trap this but re-raise it as AttributeError - all other
             # exceptions should pass through untrapped
             pass
@@ -1381,7 +1381,7 @@
     def __setattr__(self, name, value):
         try:
             return self.cl.set(self.nodeid, **{name: value})
-        except KeyError, value:
+        except KeyError as value:
             raise AttributeError, str(value)
     def __setitem__(self, name, value):
         self.cl.set(self.nodeid, **{name: value})