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

[source_changes at macosforge.org]

Revision: 5194
          http://trac.macosforge.org/projects/calendarserver/changeset/5194
Author:   wsanchez at apple.com
Date:     2010-02-24 13:09:10 -0800 (Wed, 24 Feb 2010)
Log Message:
-----------
Add tzWithID()

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-02-24 20:40:20 UTC (rev 5193)
+++ CalendarServer/trunk/twext/python/datetime.py	2010-02-24 21:09:10 UTC (rev 5194)
@@ -22,12 +22,14 @@
     "dateordatetime",
     "timerange",
     "utc",
+    "tzWithID",
 ]
 
 date     = __import__("datetime").date
 datetime = __import__("datetime").datetime
 
-from vobject.icalendar import dateTimeToString, dateToString, utc
+from vobject.icalendar import dateTimeToString, dateToString
+from vobject.icalendar import utc, getTzid as tzWithID
 
 
 # FIXME, add constants for begining/end of time

Modified: CalendarServer/trunk/twext/python/test/test_datetime.py
===================================================================
--- CalendarServer/trunk/twext/python/test/test_datetime.py	2010-02-24 20:40:20 UTC (rev 5193)
+++ CalendarServer/trunk/twext/python/test/test_datetime.py	2010-02-24 21:09:10 UTC (rev 5194)
@@ -15,15 +15,14 @@
 ##
 
 from datetime import date, datetime, timedelta
-from dateutil.tz import tzstr
 
 from twisted.internet.defer import DeferredList
 
-from twext.python.datetime import dateordatetime, timerange, utc
+from twext.python.datetime import dateordatetime, timerange, utc, tzWithID
 
 from twistedcaldav.test.util import TestCase, testUnimplemented
 
-edt = tzstr("EST5EDT")
+tzNYC = tzWithID("America/New_York")
 
 
 def timezones(f):
@@ -32,7 +31,7 @@
     """
     return lambda self: DeferredList([
         d for d in (
-            f(self, tz) for tz in (utc, edt)
+            f(self, tz) for tz in (utc, tzNYC)
         ) if d is not None
     ])
 
@@ -168,11 +167,10 @@
         dodt = dateordatetime(dt)
         self.assertEquals(dodt.iCalendarString(), "20100222T174442Z")
 
-    @testUnimplemented
     def test_datetime_iCalendarString_tz(self):
-        dt = datetime(2010, 2, 22, 17, 44, 42, 98303, tzinfo=edt)
+        dt = datetime(2010, 2, 22, 17, 44, 42, 98303, tzinfo=tzNYC)
         dodt = dateordatetime(dt)
-        self.assertEquals(dodt.iCalendarString(), "20100222T174442XXXXXX")
+        self.assertEquals(dodt.iCalendarString(), "20100222T174442")
 
     @testUnimplemented
     def test_asTimeZone(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100224/834ee554/attachment-0001.html>