<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14696] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14696">14696</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-22 08:59:53 -0700 (Wed, 22 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Freebusy performance optimizations.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolscalverifypy">CalendarServer/trunk/calendarserver/tools/calverify.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesttest_icalpy">CalendarServer/trunk/contrib/performance/loadtest/test_ical.py</a></li>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavcaldavxmlpy">CalendarServer/trunk/twistedcaldav/caldavxml.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdateopspy">CalendarServer/trunk/twistedcaldav/dateops.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavinstancepy">CalendarServer/trunk/twistedcaldav/instance.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_freebusypy">CalendarServer/trunk/twistedcaldav/method/report_freebusy.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_dateopspy">CalendarServer/trunk/twistedcaldav/test/test_dateops.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_icalendarpy">CalendarServer/trunk/twistedcaldav/test/test_icalendar.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_timezonespy">CalendarServer/trunk/twistedcaldav/test/test_timezones.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreindex_filepy">CalendarServer/trunk/txdav/caldav/datastore/index_file.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastorequeryfilterpy">CalendarServer/trunk/txdav/caldav/datastore/query/filter.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingcaldavdeliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingfreebusypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleresourcepy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_implicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_itippy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_itip.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolscalverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/calverify.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2268,7 +2268,7 @@
</span><span class="cx">
</span><span class="cx"> # Adjust floating and sort
</span><span class="cx"> if hasFloating and tzid is not None:
</span><del>- utc = Timezone(utc=True)
</del><ins>+ utc = Timezone.UTCTimezone
</ins><span class="cx"> for item in details:
</span><span class="cx"> if item.start.floating():
</span><span class="cx"> item.start.setTimezone(tzid)
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1660,7 +1660,7 @@
</span><span class="cx"> msg("Availability request spanning multiple days (%r to %r), "
</span><span class="cx"> "dropping the end date." % (start, end))
</span><span class="cx">
</span><del>- start.setTimezone(Timezone(utc=True))
</del><ins>+ start.setTimezone(Timezone.UTCTimezone)
</ins><span class="cx"> start.setHHMMSS(0, 0, 0)
</span><span class="cx"> end = start + Duration(hours=24)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_icalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1964,8 +1964,8 @@
</span><span class="cx"> self.client.outbox = "/calendars/__uids__/%s/outbox/" % (self.record.uid,)
</span><span class="cx"> requests = self.interceptRequests()
</span><span class="cx">
</span><del>- start = DateTime(2011, 6, 10, 10, 45, 0, tzid=Timezone(utc=True))
- end = DateTime(2011, 6, 10, 11, 15, 0, tzid=Timezone(utc=True))
</del><ins>+ start = DateTime(2011, 6, 10, 10, 45, 0, tzid=Timezone.UTCTimezone)
+ end = DateTime(2011, 6, 10, 11, 15, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> d = self.client.requestAvailability(
</span><span class="cx"> start, end, [u"urn:uuid:user05", u"urn:uuid:user10"])
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14576#egg=pycalendar
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14695#egg=pycalendar
</ins><span class="cx"> python-dateutil==1.5 # Note: v2.0+ is for Python 3
</span><span class="cx"> pytz==2014.10
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavcaldavxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/caldavxml.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> return tz
</span><span class="cx">
</span><span class="cx"> # Default to using utc tzinfo
</span><del>- return Timezone(utc=True)
</del><ins>+ return Timezone.UTCTimezone
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def valid(self):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdateopspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/dateops.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if pytz is None:
</span><del>- pytz = Timezone(utc=True)
</del><ins>+ pytz = Timezone.UTCTimezone
</ins><span class="cx">
</span><span class="cx"> dt = dt.duplicate()
</span><span class="cx"> dt.adjustTimezone(pytz)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def parseSQLTimestampToPyCalendar(ts):
</del><ins>+def parseSQLTimestampToPyCalendar(ts, withTimezone=None):
</ins><span class="cx"> """
</span><span class="cx"> Parse an SQL formated timestamp into a DateTime
</span><span class="cx"> @param ts: the SQL timestamp
</span><span class="lines">@@ -302,7 +302,8 @@
</span><span class="cx"> day=ts.day,
</span><span class="cx"> hours=ts.hour,
</span><span class="cx"> minutes=ts.minute,
</span><del>- seconds=ts.second
</del><ins>+ seconds=ts.second,
+ tzid=withTimezone,
</ins><span class="cx"> )
</span><span class="cx"> else:
</span><span class="cx"> # Format is "%Y-%m-%d %H:%M:%S"
</span><span class="lines">@@ -312,11 +313,50 @@
</span><span class="cx"> day=int(ts[8:10]),
</span><span class="cx"> hours=int(ts[11:13]),
</span><span class="cx"> minutes=int(ts[14:16]),
</span><del>- seconds=int(ts[17:19])
</del><ins>+ seconds=int(ts[17:19]),
+ tzid=withTimezone,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+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,
+ )
+
+
+
</ins><span class="cx"> def parseSQLDateToPyCalendar(ts):
</span><span class="cx"> """
</span><span class="cx"> Parse an SQL formated date into a DateTime
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -162,8 +162,8 @@
</span><span class="cx"> ignoredComponents = ("VTIMEZONE", PERUSER_COMPONENT,)
</span><span class="cx">
</span><span class="cx"> # Used for min/max time-range query limits
</span><del>-minDateTime = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
-maxDateTime = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+minDateTime = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+maxDateTime = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class InvalidICalendarDataError(ValueError):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavinstancepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/instance.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx"> # If the availability is beyond the end of the range we want, ignore it
</span><span class="cx"> return
</span><span class="cx"> if start is None:
</span><del>- start = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ start = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> start = self.normalizeFunction(start)
</span><span class="cx">
</span><span class="cx"> end = component.getEndDateUTC()
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> # If the availability is before the start of the range we want, ignore it
</span><span class="cx"> return
</span><span class="cx"> if end is None:
</span><del>- end = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ end = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> end = self.normalizeFunction(end)
</span><span class="cx">
</span><span class="cx"> self.addInstance(Instance(component, start, end))
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_freebusypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_freebusy.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> yield report_common.applyToCalendarCollections(self, request, request.uri, depth, getCalendarList, (caldavxml.ReadFreeBusy(),))
</span><span class="cx">
</span><span class="cx"> # Do the actual freebusy query against the set of matched calendars
</span><del>- principal = yield self.ownerPrincipal(request)
</del><ins>+ principal = yield self.resourceOwnerPrincipal(request)
</ins><span class="cx"> organizer = recipient = LocalCalendarUser(principal.canonicalCalendarUserAddress(), principal.record)
</span><span class="cx"> timerange = Period(timerange.start, timerange.end)
</span><span class="cx"> try:
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_dateopspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_dateops.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> data = (
</span><span class="cx"> (DateTime(2012, 1, 1), DateTime(2012, 1, 1, 0, 0, 0)),
</span><span class="cx"> (DateTime(2012, 1, 1, 10, 0, 0), DateTime(2012, 1, 1, 10, 0, 0)),
</span><del>- (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))),
</del><ins>+ (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)),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> for value, result in data:
</span><span class="lines">@@ -59,10 +59,10 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> data = (
</span><del>- (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))),
</del><ins>+ (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)),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> for value, result in data:
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> data = (
</span><span class="cx"> (DateTime(2012, 1, 1), DateTime(2012, 1, 1)),
</span><span class="cx"> (DateTime(2012, 1, 1, 10, 0, 0), DateTime(2012, 1, 1, 10, 0, 0)),
</span><del>- (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))),
</del><ins>+ (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)),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> for value, result in data:
</span><span class="lines">@@ -107,66 +107,66 @@
</span><span class="cx"> # Timed
</span><span class="cx"> (
</span><span class="cx"> "Start within, end within - overlap",
</span><del>- 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)),
</del><ins>+ 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),
</ins><span class="cx"> True,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "Start before, end before - no overlap",
</span><del>- 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)),
</del><ins>+ 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),
</ins><span class="cx"> False,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "Start before, end right before - no overlap",
</span><del>- 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)),
</del><ins>+ 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),
</ins><span class="cx"> False,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "Start before, end within - overlap",
</span><del>- 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)),
</del><ins>+ 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),
</ins><span class="cx"> True,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "Start after, end after - no overlap",
</span><del>- 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)),
</del><ins>+ 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),
</ins><span class="cx"> False,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "Start right after, end after - no overlap",
</span><del>- 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)),
</del><ins>+ 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),
</ins><span class="cx"> False,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "Start within, end after - overlap",
</span><del>- 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)),
</del><ins>+ 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),
</ins><span class="cx"> True,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "Start before, end after - overlap",
</span><del>- 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)),
</del><ins>+ 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),
</ins><span class="cx"> True,
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="lines">@@ -175,64 +175,64 @@
</span><span class="cx"> "All day: Start within, end within - overlap",
</span><span class="cx"> DateTime(2012, 1, 9),
</span><span class="cx"> DateTime(2012, 1, 10),
</span><del>- DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> True,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "All day: Start before, end before - no overlap",
</span><span class="cx"> DateTime(2012, 1, 1),
</span><span class="cx"> DateTime(2012, 1, 2),
</span><del>- DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> False,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "All day: Start before, end right before - no overlap",
</span><span class="cx"> DateTime(2012, 1, 7),
</span><span class="cx"> DateTime(2012, 1, 8),
</span><del>- DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> False,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "All day: Start before, end within - overlap",
</span><span class="cx"> DateTime(2012, 1, 7),
</span><span class="cx"> DateTime(2012, 1, 9),
</span><del>- DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> True,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "All day: Start after, end after - no overlap",
</span><span class="cx"> DateTime(2012, 1, 16),
</span><span class="cx"> DateTime(2012, 1, 17),
</span><del>- DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> False,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "All day: Start right after, end after - no overlap",
</span><span class="cx"> DateTime(2012, 1, 15),
</span><span class="cx"> DateTime(2012, 1, 16),
</span><del>- DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> False,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "All day: Start within, end after - overlap",
</span><span class="cx"> DateTime(2012, 1, 14),
</span><span class="cx"> DateTime(2012, 1, 16),
</span><del>- DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> True,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "All day: Start before, end after - overlap",
</span><span class="cx"> DateTime(2012, 1, 7),
</span><span class="cx"> DateTime(2012, 1, 16),
</span><del>- DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2012, 1, 8, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2012, 1, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> True,
</span><span class="cx"> ),
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_icalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> self.assertTrue(dt.floating())
</span><span class="cx">
</span><span class="cx"> dt = DateTime.parseText("19980119T070000Z")
</span><del>- self.assertEqual(dt, DateTime(1998, 1, 19, 7, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ self.assertEqual(dt, DateTime(1998, 1, 19, 7, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_parse_date_or_datetime(self):
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> self.assertTrue(dt.floating())
</span><span class="cx">
</span><span class="cx"> dt = DateTime.parseText("19980119T070000Z")
</span><del>- self.assertEqual(dt, DateTime(1998, 1, 19, 7, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ self.assertEqual(dt, DateTime(1998, 1, 19, 7, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_parse_duration(self):
</span><span class="lines">@@ -834,7 +834,7 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> ("mailto:user1@example.com", None),
</span><del>- ("mailto:user1@example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ ("mailto:user1@example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -860,7 +860,7 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> ("mailto:user1@example.com", None),
</span><del>- ("mailto:user3@example.com", DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ ("mailto:user3@example.com", DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -973,8 +973,8 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> ("mailto:user2@example.com", None),
</span><del>- ("mailto:user2@example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user3@example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ ("mailto:user2@example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user3@example.com", DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -2380,8 +2380,8 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2402,12 +2402,12 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2429,16 +2429,16 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 16, 2, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 16, 2, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2460,12 +2460,12 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2487,12 +2487,12 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2520,12 +2520,12 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2577,12 +2577,12 @@
</span><span class="cx"> True,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2621,8 +2621,8 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2664,12 +2664,12 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2717,16 +2717,16 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 16, 2, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 16, 2, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2779,12 +2779,12 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 16, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 16, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2839,12 +2839,12 @@
</span><span class="cx"> False,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 2, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -2964,8 +2964,8 @@
</span><span class="cx"> None,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> None,
</span><span class="lines">@@ -2986,8 +2986,8 @@
</span><span class="cx"> DateTime(2007, 1, 1),
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> None,
</span><span class="lines">@@ -3026,20 +3026,20 @@
</span><span class="cx"> None,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2008, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2008, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> None,
</span><span class="lines">@@ -3061,20 +3061,20 @@
</span><span class="cx"> DateTime(2007, 1, 1),
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2008, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2008, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> None,
</span><span class="lines">@@ -3096,8 +3096,8 @@
</span><span class="cx"> DateTime(2010, 1, 1),
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2010, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2010, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> DateTime(2010, 1, 1),
</span><span class="lines">@@ -3151,20 +3151,20 @@
</span><span class="cx"> None,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2008, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2008, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> None,
</span><span class="lines">@@ -3200,20 +3200,20 @@
</span><span class="cx"> DateTime(2007, 1, 1),
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2008, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2008, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 11, 14, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> None,
</span><span class="lines">@@ -3249,8 +3249,8 @@
</span><span class="cx"> DateTime(2010, 1, 1),
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2010, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2010, 11, 15, 1, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> DateTime(2010, 1, 1),
</span><span class="lines">@@ -4143,7 +4143,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VEVENT
</span><span class="cx"> UID:12345-67890-1
</span><span class="cx"> RECURRENCE-ID:20090102T080000Z
</span><span class="lines">@@ -4168,7 +4168,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 2, 18, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 18, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VEVENT
</span><span class="cx"> UID:12345-67890-1
</span><span class="cx"> RECURRENCE-ID:20090102T180000Z
</span><span class="lines">@@ -4194,7 +4194,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 3, 18, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 3, 18, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VEVENT
</span><span class="cx"> UID:12345-67890-1
</span><span class="cx"> RECURRENCE-ID:20090103T180000Z
</span><span class="lines">@@ -4218,7 +4218,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 2, 9, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 9, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> None,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -4236,7 +4236,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 2, 19, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 19, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> None,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -4255,7 +4255,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 3, 19, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 3, 19, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> None,
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -4472,8 +4472,8 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 1, 4, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 1, 4, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> """BEGIN:VEVENT
</span><span class="lines">@@ -4510,8 +4510,8 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 1, 2, 18, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 1, 4, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 18, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 1, 4, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> """BEGIN:VEVENT
</span><span class="lines">@@ -4549,8 +4549,8 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 1, 3, 18, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 1, 5, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 3, 18, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 1, 5, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> """BEGIN:VEVENT
</span><span class="lines">@@ -4586,8 +4586,8 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 1, 2, 9, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 9, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> None,
</span><span class="lines">@@ -4617,8 +4617,8 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 1, 2, 19, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 19, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> None,
</span><span class="lines">@@ -4649,8 +4649,8 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 1, 3, 19, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 3, 19, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> None,
</span><span class="lines">@@ -4695,7 +4695,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VEVENT
</span><span class="cx"> UID:12345-67890-1
</span><span class="cx"> RECURRENCE-ID:20090102T080000Z
</span><span class="lines">@@ -4722,7 +4722,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VEVENT
</span><span class="cx"> UID:12345-67890-1
</span><span class="cx"> RECURRENCE-ID:20090102T080000Z
</span><span class="lines">@@ -4765,19 +4765,19 @@
</span><span class="cx"> self.assertFalse(hasattr(ical, "cachedInstances"))
</span><span class="cx">
</span><span class="cx"> # Derive one day apart - no re-cache
</span><del>- ical.deriveInstance(DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ ical.deriveInstance(DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx"> self.assertTrue(hasattr(ical, "cachedInstances"))
</span><span class="cx"> oldLimit = ical.cachedInstances.limit
</span><del>- ical.deriveInstance(DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ ical.deriveInstance(DateTime(2009, 1, 3, 8, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx"> self.assertEqual(ical.cachedInstances.limit, oldLimit)
</span><span class="cx">
</span><span class="cx"> # Derive several years ahead - re-cached
</span><del>- ical.deriveInstance(DateTime(2011, 1, 1, 8, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ ical.deriveInstance(DateTime(2011, 1, 1, 8, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx"> self.assertNotEqual(ical.cachedInstances.limit, oldLimit)
</span><span class="cx"> oldLimit = ical.cachedInstances.limit
</span><span class="cx">
</span><span class="cx"> # Check one day ahead again - no re-cache
</span><del>- ical.deriveInstance(DateTime(2011, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)))
</del><ins>+ ical.deriveInstance(DateTime(2011, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone))
</ins><span class="cx"> self.assertEqual(ical.cachedInstances.limit, oldLimit)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -4822,13 +4822,13 @@
</span><span class="cx"> masterDerived = ical.masterDerived()
</span><span class="cx">
</span><span class="cx"> # Derive one day apart - no re-cache
</span><del>- result = ical.deriveInstance(DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone(utc=True)), newcomp=masterDerived)
</del><ins>+ result = ical.deriveInstance(DateTime(2009, 1, 2, 8, 0, 0, tzid=Timezone.UTCTimezone), newcomp=masterDerived)
</ins><span class="cx"> self.assertEqual(str(result), derived1)
</span><span class="cx">
</span><del>- result = ical.deriveInstance(DateTime(2009, 2, 3, 8, 0, 0, tzid=Timezone(utc=True)), newcomp=masterDerived)
</del><ins>+ result = ical.deriveInstance(DateTime(2009, 2, 3, 8, 0, 0, tzid=Timezone.UTCTimezone), newcomp=masterDerived)
</ins><span class="cx"> self.assertEqual(str(result), derived2)
</span><span class="cx">
</span><del>- result = ical.deriveInstance(DateTime(2009, 3, 3, 9, 0, 0, tzid=Timezone(utc=True)), newcomp=masterDerived)
</del><ins>+ result = ical.deriveInstance(DateTime(2009, 3, 3, 9, 0, 0, tzid=Timezone.UTCTimezone), newcomp=masterDerived)
</ins><span class="cx"> self.assertEqual(result, None)
</span><span class="cx">
</span><span class="cx"> self.assertEqual(str(ical), event)
</span><span class="lines">@@ -5008,8 +5008,8 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (None, True),
</span><del>- (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
- (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone(utc=True)), False),
</del><ins>+ (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
+ (DateTime(2009, 10, 4, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5027,9 +5027,9 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (None, True),
</span><del>- (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),
</del><ins>+ (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),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5047,10 +5047,10 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (None, True),
</span><del>- (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),
</del><ins>+ (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),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5069,11 +5069,11 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (None, True),
</span><del>- (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),
</del><ins>+ (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),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5093,12 +5093,12 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (None, True),
</span><del>- (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),
</del><ins>+ (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),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5121,11 +5121,11 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (None, True),
</span><del>- (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),
</del><ins>+ (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),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5150,12 +5150,12 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (None, True),
</span><del>- (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),
</del><ins>+ (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),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5173,9 +5173,9 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (None, False),
</span><del>- (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),
</del><ins>+ (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),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5207,7 +5207,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)), True),
</del><ins>+ (DateTime(2007, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone), True),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5223,7 +5223,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), False),
</del><ins>+ (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -5245,7 +5245,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone(utc=True)), False),
</del><ins>+ (DateTime(2007, 11, 15, 0, 0, 0, tzid=Timezone.UTCTimezone), False),
</ins><span class="cx"> )
</span><span class="cx"> ),
</span><span class="cx"> )
</span><span class="lines">@@ -5557,12 +5557,12 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 14, 20, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 14, 21, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 14, 20, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 14, 21, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2007, 11, 15, 21, 0, 0, tzid=Timezone(utc=True)),
- DateTime(2007, 11, 15, 22, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2007, 11, 15, 21, 0, 0, tzid=Timezone.UTCTimezone),
+ DateTime(2007, 11, 15, 22, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> ),
</span><span class="lines">@@ -5715,7 +5715,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="lines">@@ -5803,7 +5803,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="lines">@@ -5880,7 +5880,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="lines">@@ -5959,7 +5959,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="lines">@@ -6038,7 +6038,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="lines">@@ -6117,7 +6117,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="lines">@@ -6345,7 +6345,7 @@
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ),
</span><span class="lines">@@ -6390,7 +6390,7 @@
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ("user01", (False, None, None,),),
</span><span class="lines">@@ -6444,7 +6444,7 @@
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ("user01", (False, None, None,),),
</span><span class="lines">@@ -6490,19 +6490,19 @@
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (True, None, None,),),
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (True, None, None,),),
</span><span class="cx"> ),
</span><span class="lines">@@ -6565,21 +6565,21 @@
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ("user01", (True, None, None,),),
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ("user01", (True, None, None,),),
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ("user01", (False, None, None,),),
</span><span class="lines">@@ -6664,7 +6664,7 @@
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 2, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ("user01", (True, None, None,),),
</span><span class="lines">@@ -6672,7 +6672,7 @@
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 3, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ("user01", (True, None, None,),),
</span><span class="lines">@@ -6680,7 +6680,7 @@
</span><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><del>- DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2008, 6, 4, 12, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> (
</span><span class="cx"> ("", (False, None, None,),),
</span><span class="cx"> ("user01", (False, None, None,),),
</span><span class="lines">@@ -10213,7 +10213,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="lines">@@ -10281,7 +10281,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="lines">@@ -10353,7 +10353,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="lines">@@ -10402,7 +10402,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="lines">@@ -10452,7 +10452,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 31, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 31, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="lines">@@ -10501,7 +10501,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 1, 31, 6, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 1, 31, 6, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="lines">@@ -10571,7 +10571,7 @@
</span><span class="cx"> END:X-CALENDARSERVER-PERUSER
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="lines">@@ -10720,7 +10720,7 @@
</span><span class="cx"> END:X-CALENDARSERVER-PERUSER
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><del>- DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone(utc=True)),
</del><ins>+ DateTime(2009, 2, 1, 8, 0, 0, tzid=Timezone.UTCTimezone),
</ins><span class="cx"> """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_timezonespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_timezones.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx">
</span><span class="cx"> self.doTest(
</span><span class="cx"> "TruncatedApr01.ics",
</span><del>- DateTime(2007, 04, 01, 16, 0, 0, Timezone(utc=True)),
- DateTime(2007, 04, 01, 17, 0, 0, Timezone(utc=True))
</del><ins>+ DateTime(2007, 04, 01, 16, 0, 0, Timezone.UTCTimezone),
+ DateTime(2007, 04, 01, 17, 0, 0, Timezone.UTCTimezone)
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx">
</span><span class="cx"> self.doTest(
</span><span class="cx"> "TruncatedDec10.ics",
</span><del>- DateTime(2007, 12, 10, 17, 0, 0, Timezone(utc=True)),
- DateTime(2007, 12, 10, 18, 0, 0, Timezone(utc=True))
</del><ins>+ DateTime(2007, 12, 10, 17, 0, 0, Timezone.UTCTimezone),
+ DateTime(2007, 12, 10, 18, 0, 0, Timezone.UTCTimezone)
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -99,13 +99,13 @@
</span><span class="cx">
</span><span class="cx"> self.doTest(
</span><span class="cx"> "TruncatedApr01.ics",
</span><del>- DateTime(2007, 04, 01, 16, 0, 0, Timezone(utc=True)),
- DateTime(2007, 04, 01, 17, 0, 0, Timezone(utc=True)),
</del><ins>+ DateTime(2007, 04, 01, 16, 0, 0, Timezone.UTCTimezone),
+ DateTime(2007, 04, 01, 17, 0, 0, Timezone.UTCTimezone),
</ins><span class="cx"> )
</span><span class="cx"> self.doTest(
</span><span class="cx"> "TruncatedDec10.ics",
</span><del>- DateTime(2007, 12, 10, 17, 0, 0, Timezone(utc=True)),
- DateTime(2007, 12, 10, 18, 0, 0, Timezone(utc=True)),
</del><ins>+ DateTime(2007, 12, 10, 17, 0, 0, Timezone.UTCTimezone),
+ DateTime(2007, 12, 10, 18, 0, 0, Timezone.UTCTimezone),
</ins><span class="cx"> testEqual=False
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -119,13 +119,13 @@
</span><span class="cx">
</span><span class="cx"> self.doTest(
</span><span class="cx"> "TruncatedApr01.ics",
</span><del>- DateTime(2007, 04, 01, 16, 0, 0, Timezone(utc=True)),
- DateTime(2007, 04, 01, 17, 0, 0, Timezone(utc=True)),
</del><ins>+ DateTime(2007, 04, 01, 16, 0, 0, Timezone.UTCTimezone),
+ DateTime(2007, 04, 01, 17, 0, 0, Timezone.UTCTimezone),
</ins><span class="cx"> )
</span><span class="cx"> self.doTest(
</span><span class="cx"> "TruncatedDec10.ics",
</span><del>- DateTime(2007, 12, 10, 17, 0, 0, Timezone(utc=True)),
- DateTime(2007, 12, 10, 18, 0, 0, Timezone(utc=True)),
</del><ins>+ DateTime(2007, 12, 10, 17, 0, 0, Timezone.UTCTimezone),
+ DateTime(2007, 12, 10, 18, 0, 0, Timezone.UTCTimezone),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -139,13 +139,13 @@
</span><span class="cx">
</span><span class="cx"> self.doTest(
</span><span class="cx"> "TruncatedDec10.ics",
</span><del>- DateTime(2007, 12, 10, 17, 0, 0, Timezone(utc=True)),
- DateTime(2007, 12, 10, 18, 0, 0, Timezone(utc=True))
</del><ins>+ DateTime(2007, 12, 10, 17, 0, 0, Timezone.UTCTimezone),
+ DateTime(2007, 12, 10, 18, 0, 0, Timezone.UTCTimezone)
</ins><span class="cx"> )
</span><span class="cx"> self.doTest(
</span><span class="cx"> "TruncatedApr01.ics",
</span><del>- DateTime(2007, 04, 01, 16, 0, 0, Timezone(utc=True)),
- DateTime(2007, 04, 01, 17, 0, 0, Timezone(utc=True))
</del><ins>+ DateTime(2007, 04, 01, 16, 0, 0, Timezone.UTCTimezone),
+ DateTime(2007, 04, 01, 17, 0, 0, Timezone.UTCTimezone)
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -206,8 +206,8 @@
</span><span class="cx"> instance = instances[key]
</span><span class="cx"> start = instance.start
</span><span class="cx"> end = instance.end
</span><del>- 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)))
</del><ins>+ self.assertEqual(start, DateTime(2007, 12, 25, 05, 0, 0, Timezone.UTCTimezone))
+ self.assertEqual(end, DateTime(2007, 12, 25, 06, 0, 0, Timezone.UTCTimezone))
</ins><span class="cx"> break
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreindex_filepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/index_file.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx"> if master is None or not calendar.isRecurring():
</span><span class="cx"> # When there is no master we have a set of overridden components - index them all.
</span><span class="cx"> # When there is one instance - index it.
</span><del>- expand = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ expand = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> doInstanceIndexing = True
</span><span class="cx"> else:
</span><span class="cx"> # If migrating or re-creating or config option for delayed indexing is off, always index
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx"> # Now coerce indexing to off if needed
</span><span class="cx"> if not doInstanceIndexing:
</span><span class="cx"> instances = None
</span><del>- recurrenceLimit = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ recurrenceLimit = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx">
</span><span class="cx"> self._delete_from_db(name, uid, False)
</span><span class="cx">
</span><span class="lines">@@ -804,8 +804,8 @@
</span><span class="cx"> # Special - for unbounded recurrence we insert a value for "infinity"
</span><span class="cx"> # that will allow an open-ended time-range to always match it.
</span><span class="cx"> if calendar.isRecurringUnbounded():
</span><del>- start = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
- end = DateTime(2100, 1, 1, 1, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ start = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+ end = DateTime(2100, 1, 1, 1, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> float = 'N'
</span><span class="cx"> self._db_execute(
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastorequeryfilterpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/query/filter.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> instances = None
</span><span class="cx"> else:
</span><span class="cx"> # Expand the instances up to infinity
</span><del>- instances = component.expandTimeRanges(DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True)), ignoreInvalidInstances=True)
</del><ins>+ instances = component.expandTimeRanges(DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone), ignoreInvalidInstances=True)
</ins><span class="cx"> else:
</span><span class="cx"> instances = component.expandTimeRanges(maxend, ignoreInvalidInstances=True)
</span><span class="cx"> else:
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> elif isinstance(tzelement, Component):
</span><span class="cx"> tz = tzelement.gettimezone()
</span><span class="cx"> if tz is None:
</span><del>- tz = Timezone(utc=True)
</del><ins>+ tz = Timezone.UTCTimezone
</ins><span class="cx"> self.child.settzinfo(tz)
</span><span class="cx"> return tz
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingcaldavdeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -95,20 +95,19 @@
</span><span class="cx"> organizerProp = self.scheduler.calendar.getOrganizerProperty()
</span><span class="cx"> uid = self.scheduler.calendar.resourceUID()
</span><span class="cx">
</span><del>- for recipient in self.recipients:
</del><ins>+ # 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
</ins><span class="cx">
</span><del>- #
- # 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
-
</del><ins>+ 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.
</ins><span class="cx"> yield self.generateFreeBusyResponse(recipient, self.responses, organizerProp, uid, event_details)
</span><del>- else:
</del><ins>+ 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.
</ins><span class="cx"> yield self.generateResponse(recipient, self.responses)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingfreebusypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> from twistedcaldav.caldavxml import TimeRange
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.dateops import compareDateTime, normalizeToUTC, \
</span><del>- parseSQLTimestampToPyCalendar, clipPeriod, timeRangesOverlap, \
- normalizePeriodList
</del><ins>+ parseSQLTimestampToPyCalendar, pickledToPyCalendar, clipPeriod, \
+ timeRangesOverlap, normalizePeriodList, pickledFromPyCalendar
</ins><span class="cx"> from twistedcaldav.ical import Component, Property, iCalendarProductID
</span><span class="cx"> from twistedcaldav.instance import InstanceList
</span><span class="cx"> from twistedcaldav.memcacher import Memcacher
</span><span class="lines">@@ -235,10 +235,10 @@
</span><span class="cx"> # Get overall start/end
</span><span class="cx"> start = vav.getStartDateUTC()
</span><span class="cx"> if start is None:
</span><del>- start = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ start = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> end = vav.getEndDateUTC()
</span><span class="cx"> if end is None:
</span><del>- end = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ end = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> period = Period(start, end)
</span><span class="cx"> overall = clipPeriod(period, self.timerange)
</span><span class="cx"> if overall is None:
</span><span class="lines">@@ -385,138 +385,118 @@
</span><span class="cx"> calidmap = dict([(fbcalendar.id(), fbcalendar,) for fbcalendar in fbset])
</span><span class="cx"> directoryService = fbset[0].directoryService()
</span><span class="cx">
</span><del>- resources, tzinfos = yield self._matchResources(fbset)
</del><ins>+ results = yield self._matchResources(fbset)
</ins><span class="cx">
</span><del>- # 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,))
-
</del><span class="cx"> if self.accountingItems is not None:
</span><span class="cx"> self.accountingItems["fb-resources"] = {}
</span><del>- 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,
- ))
</del><ins>+ 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,
+ ))
</ins><span class="cx">
</span><span class="cx"> # Cache directory record lookup outside this loop as it is expensive and will likely
</span><span class="cx"> # always end up being called with the same organizer address.
</span><span class="cx"> recordUIDCache = {}
</span><del>- for key in aggregated_resources.iterkeys():
-
- calid, name, uid, type, test_organizer = key
</del><ins>+ for calid, result in results.items():
</ins><span class="cx"> calresource = calidmap[calid]
</span><del>- tzinfo = tzinfos[calid]
</del><ins>+ aggregated_resources, tzinfo, filter = result
+ for key in aggregated_resources.iterkeys():
</ins><span class="cx">
</span><del>- # Short-cut - if an fbtype exists we can use that
- if type == "VEVENT" and aggregated_resources[key][0][3] != '?':
</del><ins>+ name, uid, comptype, test_organizer = key
</ins><span class="cx">
</span><del>- matchedResource = False
</del><ins>+ # Short-cut - if an fbtype exists we can use that
+ if comptype == "VEVENT" and aggregated_resources[key][0][3] != '?':
</ins><span class="cx">
</span><del>- # Look at each instance
- for float, start, end, fbtype in aggregated_resources[key]:
- # Ignore free time or unknown
- if fbtype in ('F', '?'):
- continue
</del><ins>+ matchedResource = False
</ins><span class="cx">
</span><del>- # Ignore ones of this UID
- if (yield self._testIgnoreExcludeUID(uid, test_organizer, recordUIDCache, directoryService)):
- continue
</del><ins>+ # Look at each instance
+ for float, start, end, fbtype in aggregated_resources[key]:
+ # Ignore free time or unknown
+ if fbtype in ('F', '?'):
+ continue
</ins><span class="cx">
</span><del>- # 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))
</del><ins>+ # 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)
</ins><span class="cx">
</span><del>- # Clip instance to time range
- clipped = clipPeriod(Period(fbstart, duration=fbend - fbstart), self.timerange)
</del><ins>+ # Clip instance to time range
+ clipped = clipPeriod(Period(fbstart, end=fbend), self.timerange)
</ins><span class="cx">
</span><del>- # Double check for overlap
- if clipped:
- matchedResource = True
- getattr(fbinfo, self.FBInfo_index_mapper.get(fbtype, "busy")).append(clipped)
</del><ins>+ # 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)
</ins><span class="cx">
</span><del>- if matchedResource:
- # Check size of results is within limit
- matchtotal += 1
- if matchtotal > config.MaxQueryWithDataResults:
- raise QueryMaxResources(config.MaxQueryWithDataResults, matchtotal)
</del><ins>+ if matchedResource:
+ # Check size of results is within limit
+ matchtotal += 1
+ if matchtotal > config.MaxQueryWithDataResults:
+ raise QueryMaxResources(config.MaxQueryWithDataResults, matchtotal)
</ins><span class="cx">
</span><del>- # 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)
</del><ins>+ # 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)
</ins><span class="cx">
</span><del>- else:
- child = (yield calresource.calendarObjectWithName(name))
- calendar = (yield child.componentForUser())
</del><ins>+ else:
+ child = (yield calresource.calendarObjectWithName(name))
+ calendar = (yield child.componentForUser())
</ins><span class="cx">
</span><del>- # 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
</del><ins>+ # 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
</ins><span class="cx">
</span><del>- # Ignore ones of this UID
- if (yield self._testIgnoreExcludeUID(uid, calendar.getOrganizer(), recordUIDCache, calresource.directoryService())):
- continue
</del><ins>+ if self.accountingItems is not None:
+ self.accountingItems.setdefault("fb-filter-match", []).append(uid)
</ins><span class="cx">
</span><del>- if self.accountingItems is not None:
- self.accountingItems.setdefault("fb-filter-match", []).append(uid)
</del><ins>+ if filter.match(calendar, None):
</ins><span class="cx">
</span><del>- if filter.match(calendar, None):
- if self.accountingItems is not None:
- self.accountingItems.setdefault("fb-filter-matched", []).append(uid)
</del><ins>+ # Ignore ones of this UID
+ if (yield self._testIgnoreExcludeUID(uid, calendar.getOrganizer(), recordUIDCache, calresource.directoryService())):
+ continue
</ins><span class="cx">
</span><del>- # Check size of results is within limit
- matchtotal += 1
- if matchtotal > config.MaxQueryWithDataResults:
- raise QueryMaxResources(config.MaxQueryWithDataResults, matchtotal)
</del><ins>+ if self.accountingItems is not None:
+ self.accountingItems.setdefault("fb-filter-matched", []).append(uid)
</ins><span class="cx">
</span><del>- 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,)
</del><ins>+ # Check size of results is within limit
+ matchtotal += 1
+ if matchtotal > config.MaxQueryWithDataResults:
+ raise QueryMaxResources(config.MaxQueryWithDataResults, matchtotal)
</ins><span class="cx">
</span><del>- # 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)
</del><ins>+ 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,)
</ins><span class="cx">
</span><ins>+ # 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)
+
</ins><span class="cx"> returnValue(matchtotal)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -530,14 +510,12 @@
</span><span class="cx"> @type fbset: L{list} of L{Calendar}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- results = []
- tzinfos = {}
</del><ins>+ results = {}
</ins><span class="cx"> for calresource in fbset:
</span><del>- resources, tzinfo = yield self._matchCalendarResources(calresource)
- results.extend([(calresource.id(),) + tuple(resource) for resource in resources])
- tzinfos[calresource.id()] = tzinfo
</del><ins>+ aggregated_resources, tzinfo, filter = yield self._matchCalendarResources(calresource)
+ results[calresource.id()] = (aggregated_resources, tzinfo, filter,)
</ins><span class="cx">
</span><del>- returnValue((results, tzinfos,))
</del><ins>+ returnValue(results)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -547,9 +525,9 @@
</span><span class="cx"> tz = calresource.getTimezone()
</span><span class="cx">
</span><span class="cx"> # Try cache
</span><del>- resources = (yield FBCacheEntry.getCacheEntry(calresource, self.attendee_uid, self.timerange)) if config.EnableFreeBusyCache else None
</del><ins>+ aggregated_resources = (yield FBCacheEntry.getCacheEntry(calresource, self.attendee_uid, self.timerange)) if config.EnableFreeBusyCache else None
</ins><span class="cx">
</span><del>- if resources is None:
</del><ins>+ if aggregated_resources is None:
</ins><span class="cx">
</span><span class="cx"> if self.accountingItems is not None:
</span><span class="cx"> self.accountingItems["fb-uncached"] = self.accountingItems.get("fb-uncached", 0) + 1
</span><span class="lines">@@ -596,8 +574,20 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> resources = yield calresource.search(filter, useruid=self.attendee_uid, fbtype=True)
</span><ins>+
+ 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,
+ ))
+
</ins><span class="cx"> if caching:
</span><del>- yield FBCacheEntry.makeCacheEntry(calresource, self.attendee_uid, cache_timerange, resources)
</del><ins>+ yield FBCacheEntry.makeCacheEntry(calresource, self.attendee_uid, cache_timerange, aggregated_resources)
</ins><span class="cx"> except IndexedSearchException:
</span><span class="cx"> raise InternalDataStoreError("Invalid indexedSearch query")
</span><span class="cx">
</span><span class="lines">@@ -610,9 +600,10 @@
</span><span class="cx"> self.logItems["fb-cached"] = self.logItems.get("fb-cached", 0) + 1
</span><span class="cx">
</span><span class="cx"> # Determine appropriate timezone (UTC is the default)
</span><del>- tzinfo = tz.gettimezone() if tz is not None else Timezone(utc=True)
</del><ins>+ tzinfo = tz.gettimezone() if tz is not None else Timezone.UTCTimezone
+ filter = None
</ins><span class="cx">
</span><del>- returnValue((resources, tzinfo,))
</del><ins>+ returnValue((aggregated_resources, tzinfo, filter,))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -160,9 +160,9 @@
</span><span class="cx">
</span><span class="cx"> # Determine min/max date-time for iSchedule
</span><span class="cx"> now = DateTime.getNowUTC()
</span><del>- minDateTime = DateTime(now.getYear(), 1, 1, 0, 0, 0, Timezone(utc=True))
</del><ins>+ minDateTime = DateTime(now.getYear(), 1, 1, 0, 0, 0, Timezone.UTCTimezone)
</ins><span class="cx"> minDateTime.offsetYear(-1)
</span><del>- maxDateTime = DateTime(now.getYear(), 1, 1, 0, 0, 0, Timezone(utc=True))
</del><ins>+ maxDateTime = DateTime(now.getYear(), 1, 1, 0, 0, 0, Timezone.UTCTimezone)
</ins><span class="cx"> maxDateTime.offsetYear(10)
</span><span class="cx">
</span><span class="cx"> dataTypes = []
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx"> # Get the timezone property from the collection, and store in the query filter
</span><span class="cx"> # for use during the query itself.
</span><span class="cx"> tz = testcal.getTimezone()
</span><del>- tzinfo = tz.gettimezone() if tz is not None else Timezone(utc=True)
</del><ins>+ tzinfo = tz.gettimezone() if tz is not None else Timezone.UTCTimezone
</ins><span class="cx">
</span><span class="cx"> # Now do search for overlapping time-range and set instance.free based
</span><span class="cx"> # on whether there is an overlap or not.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_implicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -234,9 +234,9 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -273,12 +273,12 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user01@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user02@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user03@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user01@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user02@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user03@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -316,15 +316,15 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user01@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user02@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user03@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user01@example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user02@example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user03@example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user01@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user02@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user03@example.com", DateTime(2008, 9, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user01@example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user02@example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user03@example.com", DateTime(2008, 12, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> ("mailto:user03@example.com", None),
</span><del>- ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -634,9 +634,9 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user03@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -691,7 +691,7 @@
</span><span class="cx"> """,
</span><span class="cx"> (
</span><span class="cx"> ("mailto:user03@example.com", None),
</span><del>- ("mailto:user04@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user04@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- ("mailto:user04@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user04@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> (
</span><span class="lines">@@ -784,9 +784,9 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> (
</span><del>- ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
- ("mailto:user04@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone(utc=True))),
</del><ins>+ ("mailto:user01@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user02@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
+ ("mailto:user04@example.com", DateTime(2008, 8, 1, 12, 0, 0, tzid=Timezone.UTCTimezone)),
</ins><span class="cx"> ),
</span><span class="cx"> ),
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_itippy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_itip.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4466,7 +4466,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> ("mailto:user2@example.com",),
</span><del>- (DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),),
</del><ins>+ (DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),),
</ins><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> # Recurring component with one instance, each with one attendee - cancel instance
</span><span class="lines">@@ -4507,7 +4507,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """,
</span><span class="cx"> ("mailto:user2@example.com",),
</span><del>- (DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone(utc=True)),),
</del><ins>+ (DateTime(2008, 11, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),),
</ins><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> # Recurring component with one instance, each with one attendee - cancel master
</span><span class="lines">@@ -4568,7 +4568,7 @@
</span><span class="cx"> """,
</span><span class="cx"> "",
</span><span class="cx"> ("mailto:user2@example.com",),
</span><del>- (DateTime(2008, 12, 14, 0, 0, 0, tzid=Timezone(utc=True)),),
</del><ins>+ (DateTime(2008, 12, 14, 0, 0, 0, tzid=Timezone.UTCTimezone),),
</ins><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3729,7 +3729,7 @@
</span><span class="cx"> # When there is no master we have a set of overridden components -
</span><span class="cx"> # index them all.
</span><span class="cx"> # When there is one instance - index it.
</span><del>- expand = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ expand = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> doInstanceIndexing = True
</span><span class="cx"> else:
</span><span class="cx">
</span><span class="lines">@@ -3792,7 +3792,7 @@
</span><span class="cx"> if not doInstanceIndexing:
</span><span class="cx"> # instances = None # used by removeOldEventGroupLink() call at end
</span><span class="cx"> recurrenceLowerLimit = None
</span><del>- recurrenceLimit = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ recurrenceLimit = DateTime(1900, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx">
</span><span class="cx"> co = self._objectSchema
</span><span class="cx"> tr = schema.TIME_RANGE
</span><span class="lines">@@ -3946,8 +3946,8 @@
</span><span class="cx"> # For truncated items we insert a tomb stone lower bound so that a time-range
</span><span class="cx"> # query with just an end bound will match
</span><span class="cx"> if lowerLimitApplied or instances.lowerLimit and len(instances.instances) == 0:
</span><del>- start = DateTime(1901, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
- end = DateTime(1901, 1, 1, 1, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ start = DateTime(1901, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+ end = DateTime(1901, 1, 1, 1, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> yield self._addInstanceDetails(component, None, start, end, False, True, "UNKNOWN", isInboxItem, txn)
</span><span class="cx">
</span><span class="cx"> # Special - for unbounded recurrence we insert a value for "infinity"
</span><span class="lines">@@ -3955,8 +3955,8 @@
</span><span class="cx"> # We also need to add the "infinity" value if the event was bounded but
</span><span class="cx"> # starts after the future expansion cut-off limit.
</span><span class="cx"> if component.isRecurringUnbounded() or instances.limit and len(instances.instances) == 0:
</span><del>- start = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
- end = DateTime(2100, 1, 1, 1, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ start = DateTime(2100, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+ end = DateTime(2100, 1, 1, 1, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> yield self._addInstanceDetails(component, None, start, end, False, True, "UNKNOWN", isInboxItem, txn)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (14695 => 14696)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1464,38 +1464,38 @@
</span><span class="cx"> self.assertEqual(rmax.getYear(), nowYear + 1)
</span><span class="cx">
</span><span class="cx"> # Fully within range
</span><del>- 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))
</del><ins>+ testMin = DateTime(nowYear, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+ testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> result = yield newcalendar.notExpandedWithin(testMin, testMax)
</span><span class="cx"> self.assertEqual(result, [])
</span><span class="cx">
</span><span class="cx"> # Upper bound exceeded
</span><del>- 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))
</del><ins>+ testMin = DateTime(nowYear, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+ testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> result = yield newcalendar.notExpandedWithin(testMin, testMax)
</span><span class="cx"> self.assertEqual(result, ["indexing.ics"])
</span><span class="cx">
</span><span class="cx"> # Lower bound exceeded
</span><del>- 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))
</del><ins>+ testMin = DateTime(nowYear - 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+ testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> result = yield newcalendar.notExpandedWithin(testMin, testMax)
</span><span class="cx"> self.assertEqual(result, ["indexing.ics"])
</span><span class="cx">
</span><span class="cx"> # Lower and upper bounds exceeded
</span><del>- 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))
</del><ins>+ testMin = DateTime(nowYear - 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
+ testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> result = yield newcalendar.notExpandedWithin(testMin, testMax)
</span><span class="cx"> self.assertEqual(result, ["indexing.ics"])
</span><span class="cx">
</span><span class="cx"> # Lower none within range
</span><span class="cx"> testMin = None
</span><del>- testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ testMax = DateTime(nowYear + 1, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> result = yield newcalendar.notExpandedWithin(testMin, testMax)
</span><span class="cx"> self.assertEqual(result, [])
</span><span class="cx">
</span><span class="cx"> # Lower none and upper bounds exceeded
</span><span class="cx"> testMin = None
</span><del>- testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone(utc=True))
</del><ins>+ testMax = DateTime(nowYear + 5, 1, 1, 0, 0, 0, tzid=Timezone.UTCTimezone)
</ins><span class="cx"> result = yield newcalendar.notExpandedWithin(testMin, testMax)
</span><span class="cx"> self.assertEqual(result, ["indexing.ics"])
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>