[CalendarServer-changes] [14696] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Apr 22 08:59:53 PDT 2015


Revision: 14696
          http://trac.calendarserver.org//changeset/14696
Author:   cdaboo at apple.com
Date:     2015-04-22 08:59:53 -0700 (Wed, 22 Apr 2015)
Log Message:
-----------
Freebusy performance optimizations.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/calverify.py
    CalendarServer/trunk/contrib/performance/loadtest/ical.py
    CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/twistedcaldav/caldavxml.py
    CalendarServer/trunk/twistedcaldav/dateops.py
    CalendarServer/trunk/twistedcaldav/ical.py
    CalendarServer/trunk/twistedcaldav/instance.py
    CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
    CalendarServer/trunk/twistedcaldav/test/test_dateops.py
    CalendarServer/trunk/twistedcaldav/test/test_icalendar.py
    CalendarServer/trunk/twistedcaldav/test/test_timezones.py
    CalendarServer/trunk/txdav/caldav/datastore/index_file.py
    CalendarServer/trunk/txdav/caldav/datastore/query/filter.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_itip.py
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py

Modified: CalendarServer/trunk/calendarserver/tools/calverify.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/calverify.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/calendarserver/tools/calverify.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -2268,7 +2268,7 @@
 
         # Adjust floating and sort
         if hasFloating and tzid is not None:
-            utc = Timezone(utc=True)
+            utc = Timezone.UTCTimezone
             for item in details:
                 if item.start.floating():
                     item.start.setTimezone(tzid)

Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ical.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -1660,7 +1660,7 @@
             msg("Availability request spanning multiple days (%r to %r), "
                 "dropping the end date." % (start, end))
 
-        start.setTimezone(Timezone(utc=True))
+        start.setTimezone(Timezone.UTCTimezone)
         start.setHHMMSS(0, 0, 0)
         end = start + Duration(hours=24)
 

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -1964,8 +1964,8 @@
         self.client.outbox = "/calendars/__uids__/%s/outbox/" % (self.record.uid,)
         requests = self.interceptRequests()
 
-        start = DateTime(2011, 6, 10, 10, 45, 0, tzid=Timezone(utc=True))
-        end = DateTime(2011, 6, 10, 11, 15, 0, tzid=Timezone(utc=True))
+        start = DateTime(2011, 6, 10, 10, 45, 0, tzid=Timezone.UTCTimezone)
+        end = DateTime(2011, 6, 10, 11, 15, 0, tzid=Timezone.UTCTimezone)
         d = self.client.requestAvailability(
             start, end, [u"urn:uuid:user05", u"urn:uuid:user10"])
 

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/requirements-stable.txt	2015-04-22 15:59:53 UTC (rev 14696)
@@ -68,7 +68,7 @@
 
     --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14576#egg=pycalendar
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14695#egg=pycalendar
     python-dateutil==1.5  # Note: v2.0+ is for Python 3
     pytz==2014.10
 

Modified: CalendarServer/trunk/twistedcaldav/caldavxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/caldavxml.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/twistedcaldav/caldavxml.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -244,7 +244,7 @@
                 return tz
 
         # Default to using utc tzinfo
-        return Timezone(utc=True)
+        return Timezone.UTCTimezone
 
 
     def valid(self):

Modified: CalendarServer/trunk/twistedcaldav/dateops.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/dateops.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/twistedcaldav/dateops.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -113,7 +113,7 @@
     """
 
     if pytz is None:
-        pytz = Timezone(utc=True)
+        pytz = Timezone.UTCTimezone
 
     dt = dt.duplicate()
     dt.adjustTimezone(pytz)
@@ -286,7 +286,7 @@
 
 
 
-def parseSQLTimestampToPyCalendar(ts):
+def parseSQLTimestampToPyCalendar(ts, withTimezone=None):
     """
     Parse an SQL formated timestamp into a DateTime
     @param ts: the SQL timestamp
@@ -302,7 +302,8 @@
             day=ts.day,
             hours=ts.hour,
             minutes=ts.minute,
-            seconds=ts.second
+            seconds=ts.second,
+            tzid=withTimezone,
         )
     else:
         # Format is "%Y-%m-%d %H:%M:%S"
@@ -312,11 +313,50 @@
             day=int(ts[8:10]),
             hours=int(ts[11:13]),
             minutes=int(ts[14:16]),
-            seconds=int(ts[17:19])
+            seconds=int(ts[17:19]),
+            tzid=withTimezone,
         )
 
 
 
+def pickledFromPyCalendar(dt):
+    """
+    Parse an SQL formated timestamp into a DateTime
+    @param ts: the SQL timestamp
+    @type ts: C{str}
+
+    @return: L{DateTime} result
+    """
+
+    # Format is "%Y%m%dT%H%M%S"
+    return (
+        dt.mYear, dt.mMonth, dt.mDay, dt.mHours, dt.mMinutes, dt.mSeconds
+    )
+
+
+
+def pickledToPyCalendar(ts, withTimezone=None):
+    """
+    Parse an SQL formated timestamp into a DateTime
+    @param ts: the SQL timestamp
+    @type ts: C{str}
+
+    @return: L{DateTime} result
+    """
+
+    # Format is "%Y%m%dT%H%M%S"
+    return DateTime(
+        year=ts[0],
+        month=ts[1],
+        day=ts[2],
+        hours=ts[3],
+        minutes=ts[4],
+        seconds=ts[5],
+        tzid=withTimezone,
+    )
+
+
+
 def parseSQLDateToPyCalendar(ts):
     """
     Parse an SQL formated date into a DateTime

Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/twistedcaldav/ical.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -162,8 +162,8 @@
 ignoredComponents = ("VTIMEZONE", PERUSER_COMPONENT,)
 
 # Used for min/max time-range query limits
-minDateTime = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-maxDateTime = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+minDateTime = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+maxDateTime = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
 
 
 class InvalidICalendarDataError(ValueError):

Modified: CalendarServer/trunk/twistedcaldav/instance.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/instance.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/twistedcaldav/instance.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -534,7 +534,7 @@
             # If the availability is beyond the end of the range we want, ignore it
             return
         if start is None:
-            start = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+            start = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
         start = self.normalizeFunction(start)
 
         end = component.getEndDateUTC()
@@ -542,7 +542,7 @@
             # If the availability is before the start of the range we want, ignore it
             return
         if end is None:
-            end = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+            end = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
         end = self.normalizeFunction(end)
 
         self.addInstance(Instance(component, start, end))

Modified: CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_freebusy.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/twistedcaldav/method/report_freebusy.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -86,7 +86,7 @@
     yield report_common.applyToCalendarCollections(self, request, request.uri, depth, getCalendarList, (caldavxml.ReadFreeBusy(),))
 
     # Do the actual freebusy query against the set of matched calendars
-    principal = yield self.ownerPrincipal(request)
+    principal = yield self.resourceOwnerPrincipal(request)
     organizer = recipient = LocalCalendarUser(principal.canonicalCalendarUserAddress(), principal.record)
     timerange = Period(timerange.start, timerange.end)
     try:

Modified: CalendarServer/trunk/twistedcaldav/test/test_dateops.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_dateops.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/twistedcaldav/test/test_dateops.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -45,8 +45,8 @@
         data = (
             (DateTime(2012, 1, 1), DateTime(2012, 1, 1, 0, 0, 0)),
             (DateTime(2012, 1, 1, 10, 0, 0), DateTime(2012, 1, 1, 10, 0, 0)),
-            (DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True)), DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True))),
-            (DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")), DateTime(2012, 1, 1, 17, 0, 0, tzid=Timezone(utc=True))),
+            (DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone), DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone)),
+            (DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")), DateTime(2012, 1, 1, 17, 0, 0, tzid=Timezone.UTCTimezone)),
         )
 
         for value, result in data:
@@ -59,10 +59,10 @@
         """
 
         data = (
-            (DateTime(2012, 1, 1), DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))),
-            (DateTime(2012, 1, 1, 10, 0, 0), DateTime(2012, 1, 1, 10, 0, 0, tzid=Timezone(utc=True))),
-            (DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True)), DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True))),
-            (DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")), DateTime(2012, 1, 1, 17, 0, 0, tzid=Timezone(utc=True))),
+            (DateTime(2012, 1, 1), DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)),
+            (DateTime(2012, 1, 1, 10, 0, 0), DateTime(2012, 1, 1, 10, 0, 0, tzid=Timezone.UTCTimezone)),
+            (DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone), DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone)),
+            (DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")), DateTime(2012, 1, 1, 17, 0, 0, tzid=Timezone.UTCTimezone)),
         )
 
         for value, result in data:
@@ -77,8 +77,8 @@
         data = (
             (DateTime(2012, 1, 1), DateTime(2012, 1, 1)),
             (DateTime(2012, 1, 1, 10, 0, 0), DateTime(2012, 1, 1, 10, 0, 0)),
-            (DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True)), DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True))),
-            (DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")), DateTime(2012, 1, 1, 17, 0, 0, tzid=Timezone(utc=True))),
+            (DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone), DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone)),
+            (DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")), DateTime(2012, 1, 1, 17, 0, 0, tzid=Timezone.UTCTimezone)),
         )
 
         for value, result in data:
@@ -107,66 +107,66 @@
             # Timed
             (
                 "Start within, end within - overlap",
-                DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 True,
             ),
             (
                 "Start before, end before - no overlap",
-                DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 3, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 3, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 False,
             ),
             (
                 "Start before, end right before - no overlap",
-                DateTime(2012, 1, 1, 23, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 3, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 1, 23, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 3, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 False,
             ),
             (
                 "Start before, end within - overlap",
-                DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 11, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 3, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 11, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 3, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 True,
             ),
             (
                 "Start after, end after - no overlap",
-                DateTime(2012, 1, 2, 11, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 12, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 2, 11, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 False,
             ),
             (
                 "Start right after, end after - no overlap",
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 1, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 1, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 False,
             ),
             (
                 "Start within, end after - overlap",
-                DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 12, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 1, 12, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 True,
             ),
             (
                 "Start before, end after - overlap",
-                DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 3, 11, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 3, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 1, 11, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 3, 11, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 2, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 3, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 True,
             ),
 
@@ -175,64 +175,64 @@
                 "All day: Start within, end within - overlap",
                 DateTime(2012, 1, 9),
                 DateTime(2012, 1, 10),
-                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 True,
             ),
             (
                 "All day: Start before, end before - no overlap",
                 DateTime(2012, 1, 1),
                 DateTime(2012, 1, 2),
-                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 False,
             ),
             (
                 "All day: Start before, end right before - no overlap",
                 DateTime(2012, 1, 7),
                 DateTime(2012, 1, 8),
-                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 False,
             ),
             (
                 "All day: Start before, end within - overlap",
                 DateTime(2012, 1, 7),
                 DateTime(2012, 1, 9),
-                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 True,
             ),
             (
                 "All day: Start after, end after - no overlap",
                 DateTime(2012, 1, 16),
                 DateTime(2012, 1, 17),
-                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 False,
             ),
             (
                 "All day: Start right after, end after - no overlap",
                 DateTime(2012, 1, 15),
                 DateTime(2012, 1, 16),
-                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 False,
             ),
             (
                 "All day: Start within, end after - overlap",
                 DateTime(2012, 1, 14),
                 DateTime(2012, 1, 16),
-                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 True,
             ),
             (
                 "All day: Start before, end after - overlap",
                 DateTime(2012, 1, 7),
                 DateTime(2012, 1, 16),
-                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
-                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
                 True,
             ),
         )

Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_icalendar.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/twistedcaldav/test/test_icalendar.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -697,7 +697,7 @@
         self.assertTrue(dt.floating())
 
         dt = DateTime.parseText("19980119T070000Z")
-        self.assertEqual(dt, DateTime(1998, 1, 19, 7, 0, 0, tzid=Timezone(utc=True)))
+        self.assertEqual(dt, DateTime(1998, 1, 19, 7, 0, 0, tzid=Timezone.UTCTimezone))
 
 
     def test_parse_date_or_datetime(self):
@@ -711,7 +711,7 @@
         self.assertTrue(dt.floating())
 
         dt = DateTime.parseText("19980119T070000Z")
-        self.assertEqual(dt, DateTime(1998, 1, 19, 7, 0, 0, tzid=Timezone(utc=True)))
+        self.assertEqual(dt, DateTime(1998, 1, 19, 7, 0, 0, tzid=Timezone.UTCTimezone))
 
 
     def test_parse_duration(self):
@@ -834,7 +834,7 @@
 """,
                 (
                     ("mailto:user1 at example.com", None),
-                    ("mailto:user1 at example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)))
+                    ("mailto:user1 at example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone))
                 )
             ),
             (
@@ -860,7 +860,7 @@
 """,
                 (
                     ("mailto:user1 at example.com", None),
-                    ("mailto:user3 at example.com", DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)))
+                    ("mailto:user3 at example.com", DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone))
                 )
             ),
             (
@@ -973,8 +973,8 @@
                 False,
                 (
                     ("mailto:user2 at example.com", None),
-                    ("mailto:user2 at example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user3 at example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)))
+                    ("mailto:user2 at example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user3 at example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone))
                 )
             ),
             (
@@ -2380,8 +2380,8 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2402,12 +2402,12 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2429,16 +2429,16 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 16, 2, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 16, 2, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2460,12 +2460,12 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2487,12 +2487,12 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2520,12 +2520,12 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2577,12 +2577,12 @@
                 True,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2621,8 +2621,8 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2664,12 +2664,12 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2717,16 +2717,16 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 16, 2, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 16, 2, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2779,12 +2779,12 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2839,12 +2839,12 @@
                 False,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -2964,8 +2964,8 @@
                 None,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 ),
                 None,
@@ -2986,8 +2986,8 @@
                 DateTime(2007, 1, 1),
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 ),
                 None,
@@ -3026,20 +3026,20 @@
                 None,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2008, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2008, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 ),
                 None,
@@ -3061,20 +3061,20 @@
                 DateTime(2007, 1, 1),
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2008, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2008, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 ),
                 None,
@@ -3096,8 +3096,8 @@
                 DateTime(2010, 1, 1),
                 (
                     (
-                        DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 ),
                 DateTime(2010, 1, 1),
@@ -3151,20 +3151,20 @@
                 None,
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2008, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2008, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2008, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 ),
                 None,
@@ -3200,20 +3200,20 @@
                 DateTime(2007, 1, 1),
                 (
                     (
-                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2008, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2008, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2008, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 ),
                 None,
@@ -3249,8 +3249,8 @@
                 DateTime(2010, 1, 1),
                 (
                     (
-                        DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 ),
                 DateTime(2010, 1, 1),
@@ -4143,7 +4143,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VEVENT
 UID:12345-67890-1
 RECURRENCE-ID:20090102T080000Z
@@ -4168,7 +4168,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 2, 18, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 2, 18, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VEVENT
 UID:12345-67890-1
 RECURRENCE-ID:20090102T180000Z
@@ -4194,7 +4194,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 3, 18, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 3, 18, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VEVENT
 UID:12345-67890-1
 RECURRENCE-ID:20090103T180000Z
@@ -4218,7 +4218,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 2, 9, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 2, 9, 0, 0, tzid=Timezone.UTCTimezone),
                 None,
             ),
             (
@@ -4236,7 +4236,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 2, 19, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 2, 19, 0, 0, tzid=Timezone.UTCTimezone),
                 None,
             ),
             (
@@ -4255,7 +4255,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 3, 19, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 3, 19, 0, 0, tzid=Timezone.UTCTimezone),
                 None,
             ),
             (
@@ -4472,8 +4472,8 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)),
-                    DateTime(2009, 1, 4, 8, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone),
+                    DateTime(2009, 1, 4, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 ),
                 (
                     """BEGIN:VEVENT
@@ -4510,8 +4510,8 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 1, 2, 18, 0, 0, tzid=Timezone(utc=True)),
-                    DateTime(2009, 1, 4, 8, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 1, 2, 18, 0, 0, tzid=Timezone.UTCTimezone),
+                    DateTime(2009, 1, 4, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 ),
                 (
                     """BEGIN:VEVENT
@@ -4549,8 +4549,8 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 1, 3, 18, 0, 0, tzid=Timezone(utc=True)),
-                    DateTime(2009, 1, 5, 8, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 1, 3, 18, 0, 0, tzid=Timezone.UTCTimezone),
+                    DateTime(2009, 1, 5, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 ),
                 (
                     """BEGIN:VEVENT
@@ -4586,8 +4586,8 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 1, 2, 9, 0, 0, tzid=Timezone(utc=True)),
-                    DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 1, 2, 9, 0, 0, tzid=Timezone.UTCTimezone),
+                    DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 ),
                 (
                     None,
@@ -4617,8 +4617,8 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 1, 2, 19, 0, 0, tzid=Timezone(utc=True)),
-                    DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 1, 2, 19, 0, 0, tzid=Timezone.UTCTimezone),
+                    DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 ),
                 (
                     None,
@@ -4649,8 +4649,8 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 1, 3, 19, 0, 0, tzid=Timezone(utc=True)),
-                    DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 1, 3, 19, 0, 0, tzid=Timezone.UTCTimezone),
+                    DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 ),
                 (
                     None,
@@ -4695,7 +4695,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VEVENT
 UID:12345-67890-1
 RECURRENCE-ID:20090102T080000Z
@@ -4722,7 +4722,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VEVENT
 UID:12345-67890-1
 RECURRENCE-ID:20090102T080000Z
@@ -4765,19 +4765,19 @@
         self.assertFalse(hasattr(ical, "cachedInstances"))
 
         # Derive one day apart - no re-cache
-        ical.deriveInstance(DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)))
+        ical.deriveInstance(DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone))
         self.assertTrue(hasattr(ical, "cachedInstances"))
         oldLimit = ical.cachedInstances.limit
-        ical.deriveInstance(DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone(utc=True)))
+        ical.deriveInstance(DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone.UTCTimezone))
         self.assertEqual(ical.cachedInstances.limit, oldLimit)
 
         # Derive several years ahead - re-cached
-        ical.deriveInstance(DateTime(2011, 1, 1, 8, 0, 0, tzid=Timezone(utc=True)))
+        ical.deriveInstance(DateTime(2011, 1, 1, 8, 0, 0, tzid=Timezone.UTCTimezone))
         self.assertNotEqual(ical.cachedInstances.limit, oldLimit)
         oldLimit = ical.cachedInstances.limit
 
         # Check one day ahead again - no re-cache
-        ical.deriveInstance(DateTime(2011, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)))
+        ical.deriveInstance(DateTime(2011, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone))
         self.assertEqual(ical.cachedInstances.limit, oldLimit)
 
 
@@ -4822,13 +4822,13 @@
         masterDerived = ical.masterDerived()
 
         # Derive one day apart - no re-cache
-        result = ical.deriveInstance(DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)), newcomp=masterDerived)
+        result = ical.deriveInstance(DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone), newcomp=masterDerived)
         self.assertEqual(str(result), derived1)
 
-        result = ical.deriveInstance(DateTime(2009, 2, 3, 8, 0, 0, tzid=Timezone(utc=True)), newcomp=masterDerived)
+        result = ical.deriveInstance(DateTime(2009, 2, 3, 8, 0, 0, tzid=Timezone.UTCTimezone), newcomp=masterDerived)
         self.assertEqual(str(result), derived2)
 
-        result = ical.deriveInstance(DateTime(2009, 3, 3, 9, 0, 0, tzid=Timezone(utc=True)), newcomp=masterDerived)
+        result = ical.deriveInstance(DateTime(2009, 3, 3, 9, 0, 0, tzid=Timezone.UTCTimezone), newcomp=masterDerived)
         self.assertEqual(result, None)
 
         self.assertEqual(str(ical), event)
@@ -5008,8 +5008,8 @@
 """,
                 (
                     (None, True),
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5027,9 +5027,9 @@
 """,
                 (
                     (None, True),
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 5, 0, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 5, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5047,10 +5047,10 @@
 """,
                 (
                     (None, True),
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5069,11 +5069,11 @@
 """,
                 (
                     (None, True),
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 2, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 2, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5093,12 +5093,12 @@
 """,
                 (
                     (None, True),
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 2, 0, 0, tzid=Timezone(utc=True)), False),
-                    (DateTime(2009, 10, 3, 0, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 2, 0, 0, tzid=Timezone.UTCTimezone), False),
+                    (DateTime(2009, 10, 3, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5121,11 +5121,11 @@
 """,
                 (
                     (None, True),
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)), False),
-                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone), False),
+                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5150,12 +5150,12 @@
 """,
                 (
                     (None, True),
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone(utc=True)), False),
-                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone.UTCTimezone), False),
+                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 1, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5173,9 +5173,9 @@
 """,
                 (
                     (None, False),
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), False),
-                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), True),
-                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
+                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+                    (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5207,7 +5207,7 @@
 END:VCALENDAR
 """,
                 (
-                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
+                    (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
                 )
             ),
             (
@@ -5223,7 +5223,7 @@
 END:VCALENDAR
 """,
                 (
-                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
             (
@@ -5245,7 +5245,7 @@
 END:VCALENDAR
 """,
                 (
-                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), False),
+                    (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
                 )
             ),
         )
@@ -5557,12 +5557,12 @@
 """,
                 (
                     (
-                        DateTime(2007, 11, 14, 20, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 14, 21, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 14, 20, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 14, 21, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                     (
-                        DateTime(2007, 11, 15, 21, 0, 0, tzid=Timezone(utc=True)),
-                        DateTime(2007, 11, 15, 22, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2007, 11, 15, 21, 0, 0, tzid=Timezone.UTCTimezone),
+                        DateTime(2007, 11, 15, 22, 0, 0, tzid=Timezone.UTCTimezone),
                     ),
                 )
             ),
@@ -5715,7 +5715,7 @@
 END:VCALENDAR
 """,
             (
-                DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
                 DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
             ),
 
@@ -5803,7 +5803,7 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
                     DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
                 ),
 
@@ -5880,7 +5880,7 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
                     DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
                 ),
 
@@ -5959,7 +5959,7 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
                     DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
                 ),
 
@@ -6038,7 +6038,7 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
                     DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
                 ),
 
@@ -6117,7 +6117,7 @@
 END:VCALENDAR
 """,
                 (
-                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
+                    DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
                     DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
                 ),
 
@@ -6345,7 +6345,7 @@
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                         ),
@@ -6390,7 +6390,7 @@
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                             ("user01", (False, None, None,),),
@@ -6444,7 +6444,7 @@
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                             ("user01", (False, None, None,),),
@@ -6490,19 +6490,19 @@
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (True, None, None,),),
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (True, None, None,),),
                         ),
@@ -6565,21 +6565,21 @@
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                             ("user01", (True, None, None,),),
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                             ("user01", (True, None, None,),),
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                             ("user01", (False, None, None,),),
@@ -6664,7 +6664,7 @@
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                             ("user01", (True, None, None,),),
@@ -6672,7 +6672,7 @@
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                             ("user01", (True, None, None,),),
@@ -6680,7 +6680,7 @@
                         ),
                     ),
                     (
-                        DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone(utc=True)),
+                        DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone.UTCTimezone),
                         (
                             ("", (False, None, None,),),
                             ("user01", (False, None, None,),),
@@ -10213,7 +10213,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
@@ -10281,7 +10281,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
@@ -10353,7 +10353,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
@@ -10402,7 +10402,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
@@ -10452,7 +10452,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 31, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 31, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
@@ -10501,7 +10501,7 @@
 END:VEVENT
 END:VCALENDAR
 """,
-                DateTime(2009, 1, 31, 6, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 1, 31, 6, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
@@ -10571,7 +10571,7 @@
 END:X-CALENDARSERVER-PERUSER
 END:VCALENDAR
 """,
-                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
@@ -10720,7 +10720,7 @@
 END:X-CALENDARSERVER-PERUSER
 END:VCALENDAR
 """,
-                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
+                DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
                 """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN

Modified: CalendarServer/trunk/twistedcaldav/test/test_timezones.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_timezones.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/twistedcaldav/test/test_timezones.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -69,8 +69,8 @@
 
         self.doTest(
             "TruncatedApr01.ics",
-            DateTime(2007, 04, 01, 16, 0, 0, Timezone(utc=True)),
-            DateTime(2007, 04, 01, 17, 0, 0, Timezone(utc=True))
+            DateTime(2007, 04, 01, 16, 0, 0, Timezone.UTCTimezone),
+            DateTime(2007, 04, 01, 17, 0, 0, Timezone.UTCTimezone)
         )
 
 
@@ -84,8 +84,8 @@
 
         self.doTest(
             "TruncatedDec10.ics",
-            DateTime(2007, 12, 10, 17, 0, 0, Timezone(utc=True)),
-            DateTime(2007, 12, 10, 18, 0, 0, Timezone(utc=True))
+            DateTime(2007, 12, 10, 17, 0, 0, Timezone.UTCTimezone),
+            DateTime(2007, 12, 10, 18, 0, 0, Timezone.UTCTimezone)
         )
 
 
@@ -99,13 +99,13 @@
 
         self.doTest(
             "TruncatedApr01.ics",
-            DateTime(2007, 04, 01, 16, 0, 0, Timezone(utc=True)),
-            DateTime(2007, 04, 01, 17, 0, 0, Timezone(utc=True)),
+            DateTime(2007, 04, 01, 16, 0, 0, Timezone.UTCTimezone),
+            DateTime(2007, 04, 01, 17, 0, 0, Timezone.UTCTimezone),
         )
         self.doTest(
             "TruncatedDec10.ics",
-            DateTime(2007, 12, 10, 17, 0, 0, Timezone(utc=True)),
-            DateTime(2007, 12, 10, 18, 0, 0, Timezone(utc=True)),
+            DateTime(2007, 12, 10, 17, 0, 0, Timezone.UTCTimezone),
+            DateTime(2007, 12, 10, 18, 0, 0, Timezone.UTCTimezone),
             testEqual=False
         )
 
@@ -119,13 +119,13 @@
 
         self.doTest(
             "TruncatedApr01.ics",
-            DateTime(2007, 04, 01, 16, 0, 0, Timezone(utc=True)),
-            DateTime(2007, 04, 01, 17, 0, 0, Timezone(utc=True)),
+            DateTime(2007, 04, 01, 16, 0, 0, Timezone.UTCTimezone),
+            DateTime(2007, 04, 01, 17, 0, 0, Timezone.UTCTimezone),
         )
         self.doTest(
             "TruncatedDec10.ics",
-            DateTime(2007, 12, 10, 17, 0, 0, Timezone(utc=True)),
-            DateTime(2007, 12, 10, 18, 0, 0, Timezone(utc=True)),
+            DateTime(2007, 12, 10, 17, 0, 0, Timezone.UTCTimezone),
+            DateTime(2007, 12, 10, 18, 0, 0, Timezone.UTCTimezone),
         )
 
 
@@ -139,13 +139,13 @@
 
         self.doTest(
             "TruncatedDec10.ics",
-            DateTime(2007, 12, 10, 17, 0, 0, Timezone(utc=True)),
-            DateTime(2007, 12, 10, 18, 0, 0, Timezone(utc=True))
+            DateTime(2007, 12, 10, 17, 0, 0, Timezone.UTCTimezone),
+            DateTime(2007, 12, 10, 18, 0, 0, Timezone.UTCTimezone)
         )
         self.doTest(
             "TruncatedApr01.ics",
-            DateTime(2007, 04, 01, 16, 0, 0, Timezone(utc=True)),
-            DateTime(2007, 04, 01, 17, 0, 0, Timezone(utc=True))
+            DateTime(2007, 04, 01, 16, 0, 0, Timezone.UTCTimezone),
+            DateTime(2007, 04, 01, 17, 0, 0, Timezone.UTCTimezone)
         )
 
 
@@ -206,8 +206,8 @@
             instance = instances[key]
             start = instance.start
             end = instance.end
-            self.assertEqual(start, DateTime(2007, 12, 25, 05, 0, 0, Timezone(utc=True)))
-            self.assertEqual(end, DateTime(2007, 12, 25, 06, 0, 0, Timezone(utc=True)))
+            self.assertEqual(start, DateTime(2007, 12, 25, 05, 0, 0, Timezone.UTCTimezone))
+            self.assertEqual(end, DateTime(2007, 12, 25, 06, 0, 0, Timezone.UTCTimezone))
             break
 
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/index_file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/index_file.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/index_file.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -693,7 +693,7 @@
         if master is None or not calendar.isRecurring():
             # When there is no master we have a set of overridden components - index them all.
             # When there is one instance - index it.
-            expand = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+            expand = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
             doInstanceIndexing = True
         else:
             # If migrating or re-creating or config option for delayed indexing is off, always index
@@ -738,7 +738,7 @@
         # Now coerce indexing to off if needed
         if not doInstanceIndexing:
             instances = None
-            recurrenceLimit = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+            recurrenceLimit = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
 
         self._delete_from_db(name, uid, False)
 
@@ -804,8 +804,8 @@
             # Special - for unbounded recurrence we insert a value for "infinity"
             # that will allow an open-ended time-range to always match it.
             if calendar.isRecurringUnbounded():
-                start = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-                end = DateTime(2100, 1, 1, 1, 0, 0, tzid=Timezone(utc=True))
+                start = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+                end = DateTime(2100, 1, 1, 1, 0, 0, tzid=Timezone.UTCTimezone)
                 float = 'N'
                 self._db_execute(
                     """

Modified: CalendarServer/trunk/txdav/caldav/datastore/query/filter.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/query/filter.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/query/filter.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -145,7 +145,7 @@
                     instances = None
                 else:
                     # Expand the instances up to infinity
-                    instances = component.expandTimeRanges(DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True)), ignoreInvalidInstances=True)
+                    instances = component.expandTimeRanges(DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone), ignoreInvalidInstances=True)
             else:
                 instances = component.expandTimeRanges(maxend, ignoreInvalidInstances=True)
         else:
@@ -183,7 +183,7 @@
         elif isinstance(tzelement, Component):
             tz = tzelement.gettimezone()
         if tz is None:
-            tz = Timezone(utc=True)
+            tz = Timezone.UTCTimezone
         self.child.settzinfo(tz)
         return tz
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -95,20 +95,19 @@
         organizerProp = self.scheduler.calendar.getOrganizerProperty()
         uid = self.scheduler.calendar.resourceUID()
 
-        for recipient in self.recipients:
+        # Freebusy needs to be optimized by doing multiple attendee in parallel if possible
+        if self.freebusy:
+            # Look for special delegate extended free-busy request
+            event_details = [] if self.scheduler.calendar.getExtendedFreeBusy() else None
 
-            #
-            # Check access controls - we do not do this right now. But if we ever implement access controls to
-            # determine which users can schedule with other users, here is where we would do that test.
-            #
-
-            # Different behavior for free-busy vs regular invite
-            if self.freebusy:
-                # Look for special delegate extended free-busy request
-                event_details = [] if self.scheduler.calendar.getExtendedFreeBusy() else None
-
+            for recipient in self.recipients:
+                # Check access controls - we do not do this right now. But if we ever implement access controls to
+                # determine which users can schedule with other users, here is where we would do that test.
                 yield self.generateFreeBusyResponse(recipient, self.responses, organizerProp, uid, event_details)
-            else:
+        else:
+            for recipient in self.recipients:
+                # Check access controls - we do not do this right now. But if we ever implement access controls to
+                # determine which users can schedule with other users, here is where we would do that test.
                 yield self.generateResponse(recipient, self.responses)
 
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -27,8 +27,8 @@
 from twistedcaldav.caldavxml import TimeRange
 from twistedcaldav.config import config
 from twistedcaldav.dateops import compareDateTime, normalizeToUTC, \
-    parseSQLTimestampToPyCalendar, clipPeriod, timeRangesOverlap, \
-    normalizePeriodList
+    parseSQLTimestampToPyCalendar, pickledToPyCalendar, clipPeriod, \
+    timeRangesOverlap, normalizePeriodList, pickledFromPyCalendar
 from twistedcaldav.ical import Component, Property, iCalendarProductID
 from twistedcaldav.instance import InstanceList
 from twistedcaldav.memcacher import Memcacher
@@ -235,10 +235,10 @@
             # Get overall start/end
             start = vav.getStartDateUTC()
             if start is None:
-                start = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+                start = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
             end = vav.getEndDateUTC()
             if end is None:
-                end = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+                end = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
             period = Period(start, end)
             overall = clipPeriod(period, self.timerange)
             if overall is None:
@@ -385,138 +385,118 @@
         calidmap = dict([(fbcalendar.id(), fbcalendar,) for fbcalendar in fbset])
         directoryService = fbset[0].directoryService()
 
-        resources, tzinfos = yield self._matchResources(fbset)
+        results = yield self._matchResources(fbset)
 
-        # We care about separate instances for VEVENTs only
-        aggregated_resources = {}
-        for calid, name, uid, type, test_organizer, float, start, end, fbtype, transp in resources:
-            if transp == 'T' and fbtype != '?':
-                fbtype = 'F'
-            aggregated_resources.setdefault((calid, name, uid, type, test_organizer,), []).append((float, start, end, fbtype,))
-
         if self.accountingItems is not None:
             self.accountingItems["fb-resources"] = {}
-            for k, v in aggregated_resources.items():
-                calid, name, uid, type, test_organizer = k
-                self.accountingItems["fb-resources"][uid] = []
-                for float, start, end, fbtype in v:
-                    fbstart = parseSQLTimestampToPyCalendar(start)
-                    if float == 'Y':
-                        fbstart.setTimezone(tzinfos[calid])
-                    else:
-                        fbstart.setTimezone(Timezone(utc=True))
-                    fbend = parseSQLTimestampToPyCalendar(end)
-                    if float == 'Y':
-                        fbend.setTimezone(tzinfos[calid])
-                    else:
-                        fbend.setTimezone(Timezone(utc=True))
-                    self.accountingItems["fb-resources"][uid].append((
-                        float,
-                        str(fbstart),
-                        str(fbend),
-                        fbtype,
-                    ))
+            for calid, result in results.items():
+                aggregated_resources, tzinfo, filter = result
+                for k, v in aggregated_resources.items():
+                    name, uid, comptype, test_organizer = k
+                    self.accountingItems["fb-resources"][uid] = []
+                    for float, start, end, fbtype in v:
+                        fbstart = pickledToPyCalendar(start, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
+                        fbend = pickledToPyCalendar(end, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
+                        self.accountingItems["fb-resources"][uid].append((
+                            float,
+                            str(fbstart),
+                            str(fbend),
+                            fbtype,
+                        ))
 
         # Cache directory record lookup outside this loop as it is expensive and will likely
         # always end up being called with the same organizer address.
         recordUIDCache = {}
-        for key in aggregated_resources.iterkeys():
-
-            calid, name, uid, type, test_organizer = key
+        for calid, result in results.items():
             calresource = calidmap[calid]
-            tzinfo = tzinfos[calid]
+            aggregated_resources, tzinfo, filter = result
+            for key in aggregated_resources.iterkeys():
 
-            # Short-cut - if an fbtype exists we can use that
-            if type == "VEVENT" and aggregated_resources[key][0][3] != '?':
+                name, uid, comptype, test_organizer = key
 
-                matchedResource = False
+                # Short-cut - if an fbtype exists we can use that
+                if comptype == "VEVENT" and aggregated_resources[key][0][3] != '?':
 
-                # Look at each instance
-                for float, start, end, fbtype in aggregated_resources[key]:
-                    # Ignore free time or unknown
-                    if fbtype in ('F', '?'):
-                        continue
+                    matchedResource = False
 
-                    # Ignore ones of this UID
-                    if (yield self._testIgnoreExcludeUID(uid, test_organizer, recordUIDCache, directoryService)):
-                        continue
+                    # Look at each instance
+                    for float, start, end, fbtype in aggregated_resources[key]:
+                        # Ignore free time or unknown
+                        if fbtype in ('F', '?'):
+                            continue
 
-                    # Apply a timezone to any floating times
-                    fbstart = parseSQLTimestampToPyCalendar(start)
-                    if float == 'Y':
-                        fbstart.setTimezone(tzinfo)
-                    else:
-                        fbstart.setTimezone(Timezone(utc=True))
-                    fbend = parseSQLTimestampToPyCalendar(end)
-                    if float == 'Y':
-                        fbend.setTimezone(tzinfo)
-                    else:
-                        fbend.setTimezone(Timezone(utc=True))
+                        # Apply a timezone to any floating times
+                        fbstart = pickledToPyCalendar(start, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
+                        fbend = pickledToPyCalendar(end, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
 
-                    # Clip instance to time range
-                    clipped = clipPeriod(Period(fbstart, duration=fbend - fbstart), self.timerange)
+                        # Clip instance to time range
+                        clipped = clipPeriod(Period(fbstart, end=fbend), self.timerange)
 
-                    # Double check for overlap
-                    if clipped:
-                        matchedResource = True
-                        getattr(fbinfo, self.FBInfo_index_mapper.get(fbtype, "busy")).append(clipped)
+                        # Double check for overlap
+                        if clipped:
+                            # Ignore ones of this UID
+                            if not (yield self._testIgnoreExcludeUID(uid, test_organizer, recordUIDCache, directoryService)):
+                                clipped.setUseDuration(True)
+                                matchedResource = True
+                                getattr(fbinfo, self.FBInfo_index_mapper.get(fbtype, "busy")).append(clipped)
 
-                if matchedResource:
-                    # Check size of results is within limit
-                    matchtotal += 1
-                    if matchtotal > config.MaxQueryWithDataResults:
-                        raise QueryMaxResources(config.MaxQueryWithDataResults, matchtotal)
+                    if matchedResource:
+                        # Check size of results is within limit
+                        matchtotal += 1
+                        if matchtotal > config.MaxQueryWithDataResults:
+                            raise QueryMaxResources(config.MaxQueryWithDataResults, matchtotal)
 
-                    # Add extended details
-                    if any(self.rich_options.values()):
-                        child = (yield calresource.calendarObjectWithName(name))
-                        # Only add fully public events
-                        if not child.accessMode or child.accessMode == Component.ACCESS_PUBLIC:
-                            calendar = (yield child.componentForUser())
-                            self._addEventDetails(calendar, self.rich_options, tzinfo)
+                        # Add extended details
+                        if any(self.rich_options.values()):
+                            child = (yield calresource.calendarObjectWithName(name))
+                            # Only add fully public events
+                            if not child.accessMode or child.accessMode == Component.ACCESS_PUBLIC:
+                                calendar = (yield child.componentForUser())
+                                self._addEventDetails(calendar, self.rich_options, tzinfo)
 
-            else:
-                child = (yield calresource.calendarObjectWithName(name))
-                calendar = (yield child.componentForUser())
+                else:
+                    child = (yield calresource.calendarObjectWithName(name))
+                    calendar = (yield child.componentForUser())
 
-                # The calendar may come back as None if the resource is being changed, or was deleted
-                # between our initial index query and getting here. For now we will ignore this error, but in
-                # the longer term we need to implement some form of locking, perhaps.
-                if calendar is None:
-                    log.error("Calendar %s is missing from calendar collection %r" % (name, calresource))
-                    continue
+                    # The calendar may come back as None if the resource is being changed, or was deleted
+                    # between our initial index query and getting here. For now we will ignore this error, but in
+                    # the longer term we need to implement some form of locking, perhaps.
+                    if calendar is None:
+                        log.error("Calendar %s is missing from calendar collection %r" % (name, calresource))
+                        continue
 
-                # Ignore ones of this UID
-                if (yield self._testIgnoreExcludeUID(uid, calendar.getOrganizer(), recordUIDCache, calresource.directoryService())):
-                    continue
+                    if self.accountingItems is not None:
+                        self.accountingItems.setdefault("fb-filter-match", []).append(uid)
 
-                if self.accountingItems is not None:
-                    self.accountingItems.setdefault("fb-filter-match", []).append(uid)
+                    if filter.match(calendar, None):
 
-                if filter.match(calendar, None):
-                    if self.accountingItems is not None:
-                        self.accountingItems.setdefault("fb-filter-matched", []).append(uid)
+                        # Ignore ones of this UID
+                        if (yield self._testIgnoreExcludeUID(uid, calendar.getOrganizer(), recordUIDCache, calresource.directoryService())):
+                            continue
 
-                    # Check size of results is within limit
-                    matchtotal += 1
-                    if matchtotal > config.MaxQueryWithDataResults:
-                        raise QueryMaxResources(config.MaxQueryWithDataResults, matchtotal)
+                        if self.accountingItems is not None:
+                            self.accountingItems.setdefault("fb-filter-matched", []).append(uid)
 
-                    if calendar.mainType() == "VEVENT":
-                        self.processEventFreeBusy(calendar, fbinfo, tzinfo)
-                    elif calendar.mainType() == "VFREEBUSY":
-                        self.processFreeBusyFreeBusy(calendar, fbinfo)
-                    elif calendar.mainType() == "VAVAILABILITY":
-                        self.processAvailabilityFreeBusy(calendar, fbinfo)
-                    else:
-                        assert "Free-busy query returned unwanted component: %s in %r", (name, calresource,)
+                        # Check size of results is within limit
+                        matchtotal += 1
+                        if matchtotal > config.MaxQueryWithDataResults:
+                            raise QueryMaxResources(config.MaxQueryWithDataResults, matchtotal)
 
-                    # Add extended details
-                    if calendar.mainType() == "VEVENT" and any(self.rich_options.values()):
-                        # Only add fully public events
-                        if not child.accessMode or child.accessMode == Component.ACCESS_PUBLIC:
-                            self._addEventDetails(calendar, self.rich_options, tzinfo)
+                        if calendar.mainType() == "VEVENT":
+                            self.processEventFreeBusy(calendar, fbinfo, tzinfo)
+                        elif calendar.mainType() == "VFREEBUSY":
+                            self.processFreeBusyFreeBusy(calendar, fbinfo)
+                        elif calendar.mainType() == "VAVAILABILITY":
+                            self.processAvailabilityFreeBusy(calendar, fbinfo)
+                        else:
+                            assert "Free-busy query returned unwanted component: %s in %r", (name, calresource,)
 
+                        # Add extended details
+                        if calendar.mainType() == "VEVENT" and any(self.rich_options.values()):
+                            # Only add fully public events
+                            if not child.accessMode or child.accessMode == Component.ACCESS_PUBLIC:
+                                self._addEventDetails(calendar, self.rich_options, tzinfo)
+
         returnValue(matchtotal)
 
 
@@ -530,14 +510,12 @@
         @type fbset: L{list} of L{Calendar}
         """
 
-        results = []
-        tzinfos = {}
+        results = {}
         for calresource in fbset:
-            resources, tzinfo = yield self._matchCalendarResources(calresource)
-            results.extend([(calresource.id(),) + tuple(resource) for resource in resources])
-            tzinfos[calresource.id()] = tzinfo
+            aggregated_resources, tzinfo, filter = yield self._matchCalendarResources(calresource)
+            results[calresource.id()] = (aggregated_resources, tzinfo, filter,)
 
-        returnValue((results, tzinfos,))
+        returnValue(results)
 
 
     @inlineCallbacks
@@ -547,9 +525,9 @@
         tz = calresource.getTimezone()
 
         # Try cache
-        resources = (yield FBCacheEntry.getCacheEntry(calresource, self.attendee_uid, self.timerange)) if config.EnableFreeBusyCache else None
+        aggregated_resources = (yield FBCacheEntry.getCacheEntry(calresource, self.attendee_uid, self.timerange)) if config.EnableFreeBusyCache else None
 
-        if resources is None:
+        if aggregated_resources is None:
 
             if self.accountingItems is not None:
                 self.accountingItems["fb-uncached"] = self.accountingItems.get("fb-uncached", 0) + 1
@@ -596,8 +574,20 @@
 
             try:
                 resources = yield calresource.search(filter, useruid=self.attendee_uid, fbtype=True)
+
+                aggregated_resources = {}
+                for name, uid, comptype, test_organizer, float, start, end, fbtype, transp in resources:
+                    if transp == 'T' and fbtype != '?':
+                        fbtype = 'F'
+                    aggregated_resources.setdefault((name, uid, comptype, test_organizer,), []).append((
+                        float,
+                        pickledFromPyCalendar(parseSQLTimestampToPyCalendar(start)),
+                        pickledFromPyCalendar(parseSQLTimestampToPyCalendar(end)),
+                        fbtype,
+                    ))
+
                 if caching:
-                    yield FBCacheEntry.makeCacheEntry(calresource, self.attendee_uid, cache_timerange, resources)
+                    yield FBCacheEntry.makeCacheEntry(calresource, self.attendee_uid, cache_timerange, aggregated_resources)
             except IndexedSearchException:
                 raise InternalDataStoreError("Invalid indexedSearch query")
 
@@ -610,9 +600,10 @@
                 self.logItems["fb-cached"] = self.logItems.get("fb-cached", 0) + 1
 
             # Determine appropriate timezone (UTC is the default)
-            tzinfo = tz.gettimezone() if tz is not None else Timezone(utc=True)
+            tzinfo = tz.gettimezone() if tz is not None else Timezone.UTCTimezone
+            filter = None
 
-        returnValue((resources, tzinfo,))
+        returnValue((aggregated_resources, tzinfo, filter,))
 
 
     @inlineCallbacks

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -160,9 +160,9 @@
 
         # Determine min/max date-time for iSchedule
         now = DateTime.getNowUTC()
-        minDateTime = DateTime(now.getYear(), 1, 1, 0, 0, 0, Timezone(utc=True))
+        minDateTime = DateTime(now.getYear(), 1, 1, 0, 0, 0, Timezone.UTCTimezone)
         minDateTime.offsetYear(-1)
-        maxDateTime = DateTime(now.getYear(), 1, 1, 0, 0, 0, Timezone(utc=True))
+        maxDateTime = DateTime(now.getYear(), 1, 1, 0, 0, 0, Timezone.UTCTimezone)
         maxDateTime.offsetYear(10)
 
         dataTypes = []

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -815,7 +815,7 @@
             # Get the timezone property from the collection, and store in the query filter
             # for use during the query itself.
             tz = testcal.getTimezone()
-            tzinfo = tz.gettimezone() if tz is not None else Timezone(utc=True)
+            tzinfo = tz.gettimezone() if tz is not None else Timezone.UTCTimezone
 
             # Now do search for overlapping time-range and set instance.free based
             # on whether there is an overlap or not.

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -234,9 +234,9 @@
 END:VCALENDAR
 """,
                 (
-                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
             (
@@ -273,12 +273,12 @@
 END:VCALENDAR
 """,
                 (
-                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user01 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user02 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user03 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user01 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user02 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user03 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
             (
@@ -316,15 +316,15 @@
 END:VCALENDAR
 """,
                 (
-                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user01 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user02 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user03 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user01 at example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user02 at example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user03 at example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user01 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user02 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user03 at example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user01 at example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user02 at example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user03 at example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
             (
@@ -433,7 +433,7 @@
 """,
                 (
                     ("mailto:user03 at example.com", None),
-                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
             (
@@ -488,7 +488,7 @@
 END:VCALENDAR
 """,
                 (
-                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
             (
@@ -634,9 +634,9 @@
 END:VCALENDAR
 """,
                 (
-                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user03 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
             (
@@ -691,7 +691,7 @@
 """,
                 (
                     ("mailto:user03 at example.com", None),
-                    ("mailto:user04 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user04 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
             (
@@ -737,7 +737,7 @@
 END:VCALENDAR
 """,
                 (
-                    ("mailto:user04 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user04 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
             (
@@ -784,9 +784,9 @@
 END:VCALENDAR
 """,
                 (
-                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
-                    ("mailto:user04 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
+                    ("mailto:user01 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user02 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+                    ("mailto:user04 at example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
                 ),
             ),
         )

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_itip.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_itip.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_itip.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -4466,7 +4466,7 @@
 END:VCALENDAR
 """,
                 ("mailto:user2 at example.com",),
-                (DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),),
+                (DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),),
             ),
 
             # Recurring component with one instance, each with one attendee - cancel instance
@@ -4507,7 +4507,7 @@
 END:VCALENDAR
 """,
                 ("mailto:user2 at example.com",),
-                (DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),),
+                (DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),),
             ),
 
             # Recurring component with one instance, each with one attendee - cancel master
@@ -4568,7 +4568,7 @@
 """,
                 "",
                 ("mailto:user2 at example.com",),
-                (DateTime(2008, 12, 14, 0, 0, 0, tzid=Timezone(utc=True)),),
+                (DateTime(2008, 12, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),),
             ),
 
         )

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -3729,7 +3729,7 @@
                 # When there is no master we have a set of overridden components -
                 #   index them all.
                 # When there is one instance - index it.
-                expand = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+                expand = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
                 doInstanceIndexing = True
             else:
 
@@ -3792,7 +3792,7 @@
             if not doInstanceIndexing:
                 # instances = None # used by removeOldEventGroupLink() call at end
                 recurrenceLowerLimit = None
-                recurrenceLimit = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+                recurrenceLimit = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
 
         co = self._objectSchema
         tr = schema.TIME_RANGE
@@ -3946,8 +3946,8 @@
         # For truncated items we insert a tomb stone lower bound so that a time-range
         # query with just an end bound will match
         if lowerLimitApplied or instances.lowerLimit and len(instances.instances) == 0:
-            start = DateTime(1901, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-            end = DateTime(1901, 1, 1, 1, 0, 0, tzid=Timezone(utc=True))
+            start = DateTime(1901, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+            end = DateTime(1901, 1, 1, 1, 0, 0, tzid=Timezone.UTCTimezone)
             yield self._addInstanceDetails(component, None, start, end, False, True, "UNKNOWN", isInboxItem, txn)
 
         # Special - for unbounded recurrence we insert a value for "infinity"
@@ -3955,8 +3955,8 @@
         # We also need to add the "infinity" value if the event was bounded but
         # starts after the future expansion cut-off limit.
         if component.isRecurringUnbounded() or instances.limit and len(instances.instances) == 0:
-            start = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-            end = DateTime(2100, 1, 1, 1, 0, 0, tzid=Timezone(utc=True))
+            start = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+            end = DateTime(2100, 1, 1, 1, 0, 0, tzid=Timezone.UTCTimezone)
             yield self._addInstanceDetails(component, None, start, end, False, True, "UNKNOWN", isInboxItem, txn)
 
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2015-04-22 15:58:34 UTC (rev 14695)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2015-04-22 15:59:53 UTC (rev 14696)
@@ -1464,38 +1464,38 @@
         self.assertEqual(rmax.getYear(), nowYear + 1)
 
         # Fully within range
-        testMin = DateTime(nowYear, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-        testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+        testMin = DateTime(nowYear, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+        testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
         result = yield newcalendar.notExpandedWithin(testMin, testMax)
         self.assertEqual(result, [])
 
         # Upper bound exceeded
-        testMin = DateTime(nowYear, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-        testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+        testMin = DateTime(nowYear, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+        testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
         result = yield newcalendar.notExpandedWithin(testMin, testMax)
         self.assertEqual(result, ["indexing.ics"])
 
         # Lower bound exceeded
-        testMin = DateTime(nowYear - 5, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-        testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+        testMin = DateTime(nowYear - 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+        testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
         result = yield newcalendar.notExpandedWithin(testMin, testMax)
         self.assertEqual(result, ["indexing.ics"])
 
         # Lower and upper bounds exceeded
-        testMin = DateTime(nowYear - 5, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-        testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+        testMin = DateTime(nowYear - 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+        testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
         result = yield newcalendar.notExpandedWithin(testMin, testMax)
         self.assertEqual(result, ["indexing.ics"])
 
         # Lower none within range
         testMin = None
-        testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+        testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
         result = yield newcalendar.notExpandedWithin(testMin, testMax)
         self.assertEqual(result, [])
 
         # Lower none and upper bounds exceeded
         testMin = None
-        testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
+        testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
         result = yield newcalendar.notExpandedWithin(testMin, testMax)
         self.assertEqual(result, ["indexing.ics"])
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150422/02d378dc/attachment-0001.html>


More information about the calendarserver-changes mailing list