merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -7,6 +7,7 @@ Fixed:
 - mailgw handler can close the database on us
 - fixed grouping by a NULL Link value
 - fixed anydbm import/export (sf bugs 965216, 964457, 964450)
+- fix python 2.3.3 strftime deprecation warning (sf patch 968398)
 
 
 2004-05-28 0.7.3

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.70.2.2 2004-05-23 23:26:29 richard Exp $
+# $Id: back_metakit.py,v 1.70.2.3 2004-06-08 05:34:21 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -209,8 +209,8 @@ def addjournal(self, tablenm, nodeid, action, params, creator=None,
                          nodeid=int(nodeid),
                          date=creation,
                          action=action,
-                         user = creator,
-                         params = marshal.dumps(params))
+                         user=creator,
+                         params=marshal.dumps(params))
 
     def setjournal(self, tablenm, nodeid, journal):
         '''Set the journal to the "journal" list.'''
@@ -223,7 +223,7 @@ def setjournal(self, tablenm, nodeid, journal):
                              nodeid=int(nodeid),
                              date=date,
                              action=action,
-                             user=user,
+                             user=int(user),
                              params=marshal.dumps(params))
 
     def getjournal(self, tablenm, nodeid):
@@ -361,6 +361,15 @@ def numfiles(self):
     _UNLINK : 'unlink',
 }
 
+_names_to_actionnames = {
+    'create': _CREATE,
+    'set': _SET,
+    'retire': _RETIRE,
+    'restore': _RESTORE,
+    'link': _LINK,
+    'unlink': _UNLINK,
+}
+
 _marker = []
 
 _ALLOWSETTINGPRIVATEPROPS = 0
@@ -1700,7 +1709,8 @@ def import_journals(self, entries):
         d = {}
         for l in entries:
             l = map(eval, l)
-            nodeid, date, user, action, params = l
+            nodeid, jdate, user, action, params = l
+            jdate = int(calendar.timegm(date.Date(jdate).get_tuple()))
             r = d.setdefault(nodeid, [])
             if action == 'set':
                 for propname, value in params.items():
@@ -1716,7 +1726,8 @@ def import_journals(self, entries):
                         pwd.unpack(value)
                         value = pwd
                     params[propname] = value
-            r.append((nodeid, date.Date(date), user, action, params))
+            action = _names_to_actionnames[action]
+            r.append((nodeid, jdate, user, action, params))
 
         for nodeid, l in d.items():
             self.db.setjournal(self.classname, nodeid, l)

roundup/date.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: date.py,v 1.68 2004-05-06 02:35:46 richard Exp $
+# $Id: date.py,v 1.68.2.1 2004-06-08 05:39:37 richard Exp $
 
 """Date, time and time interval handling.
 """
@@ -349,7 +349,7 @@ def pretty(self, format='%d %B %Y'):
             format, then the day number will be removed from output.
         '''
         str = time.strftime(format, (self.year, self.month, self.day,
-            self.hour, self.minute, self.second, 0, 0, 0))
+            self.hour, self.minute, int(self.second), 0, 0, 0))
         # handle zero day by removing it
         if format.startswith('%d') and str[0] == '0':
             return ' ' + str[1:]

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: db_test_base.py,v 1.27.2.1 2004-05-16 09:33:14 richard Exp $ 
+# $Id: db_test_base.py,v 1.27.2.2 2004-06-08 05:35:44 richard Exp $ 
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -960,11 +960,13 @@ def testImportExport(self):
 
         # grab the export
         export = {}
+        journals = {}
         for cn,klass in self.db.classes.items():
             names = klass.getprops().keys()
             cl = export[cn] = [names+['is retired']]
             for id in klass.getnodeids():
                 cl.append(klass.export_list(names, id))
+            journals[cn] = klass.export_journals()
 
         # shut down this db and nuke it
         self.db.close()
@@ -983,6 +985,7 @@ def testImportExport(self):
             for itemprops in items[1:]:
                 maxid = max(maxid, int(klass.import_list(names, itemprops)))
             self.db.setid(cn, str(maxid+1))
+            klass.import_journals(journals[cn])
 
         # compare with snapshot of the database
         for cn, items in orig.items():