[CalendarServer-changes] [5655] CalendarServer/trunk/twext/python

[source_changes at macosforge.org]

Revision: 5655
          http://trac.macosforge.org/projects/calendarserver/changeset/5655
Author:   wsanchez at apple.com
Date:     2010-05-26 12:32:06 -0700 (Wed, 26 May 2010)
Log Message:
-----------
Add timetuple() to dateordatetime class to work around goofy API in datetime module (http://bugs.python.org/issue8005)

Modified Paths:
--------------
    CalendarServer/trunk/twext/python/datetime.py
    CalendarServer/trunk/twext/python/test/test_datetime.py

Modified: CalendarServer/trunk/twext/python/datetime.py
===================================================================
--- CalendarServer/trunk/twext/python/datetime.py	2010-05-26 18:39:34 UTC (rev 5654)
+++ CalendarServer/trunk/twext/python/datetime.py	2010-05-26 19:32:06 UTC (rev 5655)
@@ -120,6 +120,17 @@
         dt1, dt2 = self._comparableDatetimes(other)
         return dt1 - dt2
 
+    def timetuple(self):
+        #
+        # This attribute is required in order to allow comparisions
+        # against dates and datetimes in Python 2.x.
+        #
+        # See:
+        #   http://bugs.python.org/issue8005#msg104333
+        #   http://docs.python.org/library/datetime.html#datetime.date.timetuple
+        #
+        return self.datetime().timetuple()
+
     def date(self):
         if self._isDatetime:
             return self._dateOrDatetime.date()

Modified: CalendarServer/trunk/twext/python/test/test_datetime.py
===================================================================
--- CalendarServer/trunk/twext/python/test/test_datetime.py	2010-05-26 18:39:34 UTC (rev 5654)
+++ CalendarServer/trunk/twext/python/test/test_datetime.py	2010-05-26 19:32:06 UTC (rev 5655)
@@ -101,7 +101,7 @@
         #
 
         self.assertTrue (first        == base(first) )
-       #self.assertTrue (base(first)  == first       ) # Bug in datetime
+        self.assertTrue (base(first)  == first       ) # Bug in datetime
         self.assertTrue (first        == base(first) )
         self.assertTrue (first        != base(second))
         self.assertTrue (base(first)  != second      )
@@ -109,36 +109,36 @@
         self.assertTrue (first        <  second      )
         self.assertTrue (second       <  third       )
         self.assertTrue (first        <  base(second))
-       #self.assertTrue (base(second) <  third       ) # Bug in datetime
+        self.assertTrue (base(second) <  third       ) # Bug in datetime
         self.assertTrue (first        <  second      )
         self.assertTrue (second       <  third       )
-       #self.assertTrue (base(first)  <  second      )
+        self.assertTrue (base(first)  <  second      )
         self.assertTrue (second       <  base(third) ) # Bug in datetime
         self.assertTrue (first        <= second      )
         self.assertTrue (second       <= third       )
         self.assertTrue (first        <= base(second))
-       #self.assertTrue (base(second) <= third       ) # Bug in datetime
+        self.assertTrue (base(second) <= third       ) # Bug in datetime
         self.assertTrue (first        <= base(second))
-       #self.assertTrue (base(second) <= third       ) # Bug in datetime
+        self.assertTrue (base(second) <= third       ) # Bug in datetime
         self.assertTrue (first        <= second      )
         self.assertTrue (second       <= third       )
-       #self.assertTrue (base(first)  <= second      ) # Bug in datetime
+        self.assertTrue (base(first)  <= second      ) # Bug in datetime
         self.assertTrue (second       <= base(third) )
         self.assertFalse(first        >  second      )
         self.assertFalse(second       >  third       )
         self.assertFalse(first        >  base(second))
-       #self.assertFalse(base(second) >  third       ) # Bug in datetime
+        self.assertFalse(base(second) >  third       ) # Bug in datetime
         self.assertFalse(first        >  second      )
         self.assertFalse(second       >  third       )
-       #self.assertFalse(base(first)  >  second      ) # Bug in datetime
+        self.assertFalse(base(first)  >  second      ) # Bug in datetime
         self.assertFalse(second       >  base(third) )
         self.assertFalse(first        >= second      )
         self.assertFalse(second       >= third       )
         self.assertFalse(first        >= base(second))
-       #self.assertFalse(base(second) >= third       ) # Bug in datetime
+        self.assertFalse(base(second) >= third       ) # Bug in datetime
         self.assertFalse(first        >= second      )
         self.assertFalse(second       >= third       )
-       #self.assertFalse(base(first)  >= second      ) # Bug in datetime
+        self.assertFalse(base(first)  >= second      ) # Bug in datetime
         self.assertFalse(second       >= base(third) )
 
     def test_date_iCalendarString(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100526/803fa082/attachment.html>