Mercurial > p > roundup > code
changeset 3399:3a0d4e4a0f34
merge from maint-0-8
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Mon, 18 Jul 2005 02:35:18 +0000 |
| parents | 8c113ca4a5fb |
| children | 62e4032cb280 |
| files | roundup/backends/rdbms_common.py roundup/hyperdb.py |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/backends/rdbms_common.py Mon Jul 18 02:19:40 2005 +0000 +++ b/roundup/backends/rdbms_common.py Mon Jul 18 02:35:18 2005 +0000 @@ -1,4 +1,4 @@ -# $Id: rdbms_common.py,v 1.157 2005-07-12 01:37:50 richard Exp $ +# $Id: rdbms_common.py,v 1.158 2005-07-18 02:35:18 richard Exp $ ''' Relational database (SQL) backend common code. Basics: @@ -1669,6 +1669,7 @@ if value is not None and type(value) != type('') and type(value) != type(u''): raise TypeError, 'new property "%s" not a string'%propname if prop.indexme: + if value is None: value = '' self.db.indexer.add_text((self.classname, nodeid, propname), value)
--- a/roundup/hyperdb.py Mon Jul 18 02:19:40 2005 +0000 +++ b/roundup/hyperdb.py Mon Jul 18 02:35:18 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.110 2005-07-18 01:43:56 richard Exp $ +# $Id: hyperdb.py,v 1.111 2005-07-18 02:35:18 richard Exp $ """Hyperdatabase implementation, especially field types. """ @@ -55,7 +55,7 @@ p.scheme = m.group(1) if p.scheme not in 'SHA crypt plaintext'.split(): raise HyperdbValueError, 'property %s: unknown encryption '\ - 'scheme %r'%(propname, p.scheme) + 'scheme %r'%(kw['propname'], p.scheme) p.password = m.group(2) value = p else: