fixes

Author: Richard Jones

roundup/cgi/actions.py

@@ -1,8 +1,8 @@
-#$Id: actions.py,v 1.40.2.5 2005-02-15 00:22:24 richard Exp $
+#$Id: actions.py,v 1.40.2.6 2005-02-15 23:42:36 richard Exp $
 
-import re, cgi, StringIO, urllib, Cookie, time, random
+import re, cgi, StringIO, urllib, Cookie, time, random, csv
 
-from roundup import hyperdb, token, date, password, csv
+from roundup import hyperdb, token, date, password
 from roundup.i18n import _
 import roundup.exceptions
 from roundup.cgi import exceptions, templating
@@ -507,7 +507,7 @@ def lastNodeActivity(self):
     def detectCollision(self, user_activity, node_activity):
         '''Check for a collision and return the list of props we edited
         that conflict.'''
-        if user_activity < node_activity:
+        if user_activity and user_activity < node_activity:
             props, links = self.client.parsePropsFromForm()
             key = (self.classname, self.nodeid)
             # we really only collide for direct prop edit conflicts

roundup/cgi/templating.py

@@ -19,9 +19,9 @@
 
 from __future__ import nested_scopes
 
-import sys, cgi, urllib, os, re, os.path, time, errno, mimetypes
+import sys, cgi, urllib, os, re, os.path, time, errno, mimetypes, csv
 
-from roundup import hyperdb, date, csv, support
+from roundup import hyperdb, date, support
 from roundup import i18n
 from roundup.i18n import _
 

roundup/mailgw.py

@@ -72,7 +72,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.159.2.3 2005-02-14 05:55:20 richard Exp $
+$Id: mailgw.py,v 1.159.2.4 2005-02-15 23:42:30 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -319,7 +319,7 @@ def __init__(self, instance, db, arguments=()):
                 self.default_class = value.strip()
 
         self.mailer = Mailer(instance.config)
-        self.logger = getLogger('mailgw')
+        self.logger = logging.getLogger('mailgw')
 
         # should we trap exceptions (normal usage) or pass them through
         # (for testing)

test/test_actions.py

@@ -168,10 +168,14 @@ def get(nodeid, propname):
         self.assertEqual(self.action.lastNodeActivity(), self.now)
 
     def testCollision(self):
-        self.failUnless(self.action.detectCollision(
-            self.now, self.now + Interval("1d")))
-        self.failIf(self.action.detectCollision(
-            self.now, self.now - Interval("1d")))
+        # fake up an actual change
+        self.action.classname = 'test'
+        self.action.nodeid = '1'
+        self.client.parsePropsFromForm = lambda: ({('test','1'):{1:1}}, [])
+        self.failUnless(self.action.detectCollision(self.now,
+            self.now + Interval("1d")))
+        self.failIf(self.action.detectCollision(self.now,
+            self.now - Interval("1d")))
         self.failIf(self.action.detectCollision(None, self.now))
 
 class LoginTestCase(ActionTestCase):