merge from maint-0-8

Author: Richard Jones

roundup/backends/rdbms_common.py

@@ -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 @@ def set_inner(self, nodeid, **propvalues):
                 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)
 

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.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 @@ def from_raw(self, value, **kw):
             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: