Mercurial > p > roundup > code
changeset 3393:18e6e1326d4b
merge from maint-0-8
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Mon, 18 Jul 2005 01:43:56 +0000 |
| parents | a2e4b8ab5b51 |
| children | 5c7ff95fecad |
| files | roundup/hyperdb.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/hyperdb.py Mon Jul 18 01:35:48 2005 +0000 +++ b/roundup/hyperdb.py Mon Jul 18 01:43:56 2005 +0000 @@ -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 @@ ' 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 @@ 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 @@ 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 @@ 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 @@ 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