merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -18,6 +18,8 @@ Fixed:
 - fix lookup of REMOTE_USER (sf bug 1002923)
 - new Interval props weren't created properly in rdbms
 - date.Interval() now accepts an Interval as a spec (sf bug 1041266)
+- handle deleted properties in RDBMS history
+- apply timezone in correct direction in user input (sf bug 1013097)
 
 
 2004-07-21 0.7.6

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.21 2004-10-08 00:21:31 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.22 2004-10-08 00:57:22 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1131,7 +1131,10 @@ def getjournal(self, classname, nodeid):
                 for param, value in params.items():
                     if not value:
                         continue
-                    property = properties[param]
+                    property = properties.get(param, None)
+                    if property is None:
+                        # deleted property
+                        continue
                     cvt = self.sql_to_hyperdb_value[property.__class__]
                     if isinstance(property, Password):
                         params[param] = cvt(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.97.2.4 2004-07-20 06:00:07 richard Exp $
+# $Id: hyperdb.py,v 1.97.2.5 2004-10-08 00:57:22 richard Exp $
 
 """Hyperdatabase implementation, especially field types.
 """
@@ -671,7 +671,7 @@ def rawToHyperdb(db, klass, itemid, propname, value,
     elif isinstance(proptype, Date):
         try:
             tz = db.getUserTimezone()
-            value = date.Date(value).local(tz)
+            value = date.Date(value).local(-tz)
         except ValueError, message:
             raise HyperdbValueError, 'property %s: %r is an invalid '\
                 'date (%s)'%(propname, value, message)