merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -10,7 +10,8 @@ Fixed:
 - less specific messages for login failures (thanks Chris Withers)
 - Reject raised against email messages should result in email rejection, not
   discarding of the message
-- mailgw can override the MAIL_DEFUALT_CLASS
+- mailgw can override the MAIL_DEFAULT_CLASS
+- handle Py2.3+ datetime objects as Date specs (sf bug 971300)
 
 
 2004-07-21 0.7.6

doc/index.txt

@@ -117,6 +117,7 @@ Roy Rapoport,
 John P. Rouillard,
 Ollie Rutherfurd,
 Toby Sargeant,
+Gregor Schmid,
 Florian Schulze,
 Klamer Schutte,
 Dougal Scott,

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.2.2 2004-07-04 09:08:55 richard Exp $
+# $Id: date.py,v 1.68.2.3 2004-09-29 07:31:32 richard Exp $
 
 """Date, time and time interval handling.
 """
@@ -25,6 +25,12 @@
 from types import *
 from i18n import _
 
+try:
+    import datetime
+    have_datetime = 1
+except:
+    have_datetime = 0
+
 def _add_granularity(src, order, value = 1):
     '''Increment first non-None value in src dictionary ordered by 'order'
     parameter
@@ -121,6 +127,11 @@ def __init__(self, spec='.', offset=0, add_granularity=0):
         if type(spec) == type(''):
             self.set(spec, offset=offset, add_granularity=add_granularity)
             return
+        elif have_datetime and isinstance(spec, datetime.datetime):
+            # Python 2.3+ datetime object
+            y,m,d,H,M,S,x,x,x = spec.timetuple()
+            S += spec.microsecond/1000000.
+            spec = (y,m,d,H,M,S,x,x,x)
         elif hasattr(spec, 'tuple'):
             spec = spec.tuple()
         elif isinstance(spec, Date):

test/test_dates.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_dates.py,v 1.32 2004-04-18 05:31:03 richard Exp $
+# $Id: test_dates.py,v 1.32.2.1 2004-09-29 07:31:32 richard Exp $
 from __future__ import nested_scopes
 
 import unittest, time
@@ -372,6 +372,14 @@ def ae(spec, pretty):
         ae('-1y', '1 year ago')
         ae('-2y', '2 years ago')
 
+    def testPyDatetime(self):
+        try:
+            import datetime
+        except:
+            return
+        d = datetime.datetime.now()
+        Date(d)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DateTestCase))