merge from maint-0-8

Author: Richard Jones

roundup/hyperdb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: hyperdb.py,v 1.109 2005-07-12 01:37:49 richard Exp $
+# $Id: hyperdb.py,v 1.110 2005-07-18 01:43:56 richard Exp $
 
 """Hyperdatabase implementation, especially field types.
 """
@@ -48,7 +48,7 @@ def __repr__(self):
         ' more useful for dumps '
         return '<%s>'%self.__class__
     def from_raw(self, value, **kw):
-        m = password.Passowrd.pwre.match(value)
+        m = password.Password.pwre.match(value)
         if m:
             # password is being given to us encrypted
             p = password.Password()
@@ -81,7 +81,7 @@ def from_raw(self, value, db, **kw):
             value = date.Date(value).local(-self.offset(db))
         except ValueError, message:
             raise HyperdbValueError, 'property %s: %r is an invalid '\
-                'date (%s)'%(propname, value, message)
+                'date (%s)'%(kw['propname'], value, message)
         return value
     def range_from_raw (self, value, db):
         """return Range value from given raw value with offset correction"""
@@ -97,7 +97,7 @@ def from_raw(self, value, **kw):
             value = date.Interval(value)
         except ValueError, message:
             raise HyperdbValueError, 'property %s: %r is an invalid '\
-                'date interval (%s)'%(propname, value, message)
+                'date interval (%s)'%(kw['propname'], value, message)
         return value
 
 class Link:
@@ -170,7 +170,7 @@ def from_raw(self, value, db, klass, propname, itemid, **kw):
                 set = 0
 
             # look up the value
-            itemid = convertLinkValue(db, propname, proptype, item)
+            itemid = convertLinkValue(db, propname, self, item)
 
             # perform the add/remove
             if remove:
@@ -220,7 +220,7 @@ def from_raw(self, value, **kw):
             value = float(value)
         except ValueError:
             raise HyperdbValueError, 'property %s: %r is not a number'%(
-                propname, value)
+                kw['propname'], value)
         return value
 #
 # Support for splitting designators