<!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>[14699] 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/14699">14699</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-23 10:51:44 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix docstrs and change method names.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdateopspy">CalendarServer/trunk/twistedcaldav/dateops.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingfreebusypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdateopspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/dateops.py (14698 => 14699)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/dateops.py 2015-04-23 17:29:31 UTC (rev 14698)
+++ CalendarServer/trunk/twistedcaldav/dateops.py 2015-04-23 17:51:44 UTC (rev 14699)
</span><span class="lines">@@ -319,39 +319,44 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def pickledFromPyCalendar(dt):
</del><ins>+def tupleFromDateTime(dt):
</ins><span class="cx"> """
</span><del>- Parse an SQL formated timestamp into a DateTime
- @param ts: the SQL timestamp
- @type ts: C{str}
</del><ins>+ Convert a L{DateTime} into a L{tuple} of L{int}s that performs better when pickled.
</ins><span class="cx">
</span><del>- @return: L{DateTime} result
</del><ins>+ @param dt: the date time to convert
+ @type dt: L{DateTime}
+
+ @return: L{tuple} result
</ins><span class="cx"> """
</span><span class="cx">
</span><del>- # Format is "%Y%m%dT%H%M%S"
</del><ins>+ # Expand the date and time components into a tuple
</ins><span class="cx"> return (
</span><span class="cx"> dt.mYear, dt.mMonth, dt.mDay, dt.mHours, dt.mMinutes, dt.mSeconds
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def pickledToPyCalendar(ts, withTimezone=None):
</del><ins>+def tupleToDateTime(tp, withTimezone=None):
</ins><span class="cx"> """
</span><del>- Parse an SQL formated timestamp into a DateTime
- @param ts: the SQL timestamp
- @type ts: C{str}
</del><ins>+ Turn an L{tuple} produced by L{tupleFromDateTime} into an L{DateTime} and use the provided
+ time zone.
</ins><span class="cx">
</span><ins>+ @param tp: the tuple to convert
+ @type tp: L{tuple}
+ @param withTimezone: time zone to use or L{None}
+ @type withTimezone: L{Timezone}
+
</ins><span class="cx"> @return: L{DateTime} result
</span><span class="cx"> """
</span><span class="cx">
</span><del>- # Format is "%Y%m%dT%H%M%S"
</del><ins>+ # Construct date time from tuple components
</ins><span class="cx"> return DateTime(
</span><del>- year=ts[0],
- month=ts[1],
- day=ts[2],
- hours=ts[3],
- minutes=ts[4],
- seconds=ts[5],
</del><ins>+ year=tp[0],
+ month=tp[1],
+ day=tp[2],
+ hours=tp[3],
+ minutes=tp[4],
+ seconds=tp[5],
</ins><span class="cx"> tzid=withTimezone,
</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 (14698 => 14699)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py 2015-04-23 17:29:31 UTC (rev 14698)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/freebusy.py 2015-04-23 17:51:44 UTC (rev 14699)
</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, pickledToPyCalendar, clipPeriod, \
- timeRangesOverlap, normalizePeriodList, pickledFromPyCalendar
</del><ins>+ parseSQLTimestampToPyCalendar, tupleToDateTime, clipPeriod, \
+ timeRangesOverlap, normalizePeriodList, tupleFromDateTime
</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">@@ -395,8 +395,8 @@
</span><span class="cx"> name, uid, comptype, test_organizer = k
</span><span class="cx"> self.accountingItems["fb-resources"][uid] = []
</span><span class="cx"> for float, start, end, fbtype in v:
</span><del>- fbstart = pickledToPyCalendar(start, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
- fbend = pickledToPyCalendar(end, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
</del><ins>+ fbstart = tupleToDateTime(start, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
+ fbend = tupleToDateTime(end, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
</ins><span class="cx"> self.accountingItems["fb-resources"][uid].append((
</span><span class="cx"> float,
</span><span class="cx"> str(fbstart),
</span><span class="lines">@@ -426,8 +426,8 @@
</span><span class="cx"> continue
</span><span class="cx">
</span><span class="cx"> # Apply a timezone to any floating times
</span><del>- fbstart = pickledToPyCalendar(start, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
- fbend = pickledToPyCalendar(end, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
</del><ins>+ fbstart = tupleToDateTime(start, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
+ fbend = tupleToDateTime(end, withTimezone=tzinfo if float == 'Y' else Timezone.UTCTimezone)
</ins><span class="cx">
</span><span class="cx"> # Clip instance to time range
</span><span class="cx"> clipped = clipPeriod(Period(fbstart, end=fbend), self.timerange)
</span><span class="lines">@@ -581,8 +581,8 @@
</span><span class="cx"> fbtype = 'F'
</span><span class="cx"> aggregated_resources.setdefault((name, uid, comptype, test_organizer,), []).append((
</span><span class="cx"> float,
</span><del>- pickledFromPyCalendar(parseSQLTimestampToPyCalendar(start)),
- pickledFromPyCalendar(parseSQLTimestampToPyCalendar(end)),
</del><ins>+ tupleFromDateTime(parseSQLTimestampToPyCalendar(start)),
+ tupleFromDateTime(parseSQLTimestampToPyCalendar(end)),
</ins><span class="cx"> fbtype,
</span><span class="cx"> ))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>