<!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>[13917] CalendarServer/trunk/txdav</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/13917">13917</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-08-25 10:39:41 -0700 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpsclientpy">CalendarServer/trunk/txdav/dps/client.py</a></li>
<li><a href="#CalendarServertrunktxdavdpscommandspy">CalendarServer/trunk/txdav/dps/commands.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsjsonpy">CalendarServer/trunk/txdav/dps/json.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsserverpy">CalendarServer/trunk/txdav/dps/server.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoaugmentpy">CalendarServer/trunk/txdav/who/augment.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoidirectorypy">CalendarServer/trunk/txdav/who/idirectory.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_cachepy">CalendarServer/trunk/txdav/who/test/test_cache.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (13916 => 13917)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-08-25 17:39:41 UTC (rev 13917)
</span><span class="lines">@@ -345,7 +345,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def recordsFromExpression(self, expression, recordTypes=None):
</span><span class="cx"> raise NotImplementedError(
</span><span class="cx"> "This won't work until expressions are serializable to send "
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpscommandspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/commands.py (13916 => 13917)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/commands.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/dps/commands.py 2014-08-25 17:39:41 UTC (rev 13917)
</span><span class="lines">@@ -159,6 +159,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ExpandedMemberUIDsCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('uid', amp.String()),
</span><span class="lines">@@ -211,6 +212,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ExternalDelegatesCommand(amp.Command):
</span><span class="cx"> arguments = []
</span><span class="cx"> response = [
</span><span class="lines">@@ -219,6 +221,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class StatsCommand(amp.Command):
</span><span class="cx"> arguments = []
</span><span class="cx"> response = [
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsjsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/json.py (13916 => 13917)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/json.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/dps/json.py 2014-08-25 17:39:41 UTC (rev 13917)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def existsExpressionAsJSON(expression):
</span><span class="cx"> return dict(
</span><span class="cx"> type=expression.__class__.__name__,
</span><span class="lines">@@ -54,6 +55,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def booleanExpressionAsJSON(expression):
</span><span class="cx"> return dict(
</span><span class="cx"> type=expression.__class__.__name__,
</span><span class="lines">@@ -137,6 +139,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def existsExpressionFromJSON(service, json):
</span><span class="cx"> try:
</span><span class="cx"> jsonField = json["field"]
</span><span class="lines">@@ -150,6 +153,7 @@
</span><span class="cx"> return ExistsExpression(fieldName)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def booleanExpressionFromJSON(service, json):
</span><span class="cx"> try:
</span><span class="cx"> jsonField = json["field"]
</span><span class="lines">@@ -163,6 +167,7 @@
</span><span class="cx"> return BooleanExpression(fieldName)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def compoundExpressionFromJSON(json):
</span><span class="cx"> try:
</span><span class="cx"> expressions_json = json["expressions"]
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/server.py (13916 => 13917)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/server.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/dps/server.py 2014-08-25 17:39:41 UTC (rev 13917)
</span><span class="lines">@@ -208,8 +208,6 @@
</span><span class="cx"> return response
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> def recordToDict(self, record):
</span><span class="cx"> """
</span><span class="cx"> Turn a record in a dictionary of fields which can be reconstituted
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/augment.py (13916 => 13917)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/augment.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/who/augment.py 2014-08-25 17:39:41 UTC (rev 13917)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> def stats(self):
</span><span class="cx"> results = {}
</span><span class="cx"> results.update(self._timings)
</span><del>-
</del><ins>+
</ins><span class="cx"> # An LDAP DS has extra info to expose via the dashboard
</span><span class="cx"> if self._ldapDS is not None:
</span><span class="cx"> results.update(self._ldapDS.poolStats)
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13916 => 13917)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-08-25 17:39:41 UTC (rev 13917)
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class GroupAttendeeReconciliationWork(
</span><span class="cx"> WorkItem, fromTable(schema.GROUP_ATTENDEE_RECONCILE_WORK)
</span><span class="cx"> ):
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoidirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/idirectory.py (13916 => 13917)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/idirectory.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/who/idirectory.py 2014-08-25 17:39:41 UTC (rev 13917)
</span><span class="lines">@@ -164,8 +164,6 @@
</span><span class="cx"> readWriteProxy.description = u"read-write proxy group"
</span><span class="cx"> readWriteProxy.valueType = BaseFieldName.valueType(BaseFieldName.uid)
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> # For "locations", i.e., scheduled spaces:
</span><span class="cx">
</span><span class="cx"> associatedAddress = NamedConstant()
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_cachepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_cache.py (13916 => 13917)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_cache.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/who/test/test_cache.py 2014-08-25 17:39:41 UTC (rev 13917)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> self.storeUnderTest().setDirectoryService(self.cachingDirectory)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_cachingPassThrough(self):
</span><span class="cx"> """
</span><span class="lines">@@ -76,7 +75,6 @@
</span><span class="cx"> self.assertEquals(record.uid, u"cache-uid-2")
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_cachingHitsAndMisses(self):
</span><span class="cx"> """
</span><span class="lines">@@ -255,7 +253,7 @@
</span><span class="cx"> # After SCAN_AFTER_LOOKUP_COUNT requests, however, that expired entry
</span><span class="cx"> # will be removed
</span><span class="cx">
</span><del>- for i in xrange(SCAN_AFTER_LOOKUP_COUNT):
</del><ins>+ for _ignore_i in xrange(SCAN_AFTER_LOOKUP_COUNT):
</ins><span class="cx"> yield dir.recordWithUID(u"cache-uid-2")
</span><span class="cx">
</span><span class="cx"> # cache-uid-1 no longer in cache
</span></span></pre>
</div>
</div>
</body>
</html>