<!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>[13485] 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/13485">13485</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-16 07:30:46 -0700 (Fri, 16 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Whitespace.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolscalverifypy">CalendarServer/trunk/calendarserver/tools/calverify.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsgatewaypy">CalendarServer/trunk/calendarserver/tools/gateway.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsresourcespy">CalendarServer/trunk/calendarserver/tools/resources.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_agentpy">CalendarServer/trunk/calendarserver/tools/test/test_agent.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_calverifypy">CalendarServer/trunk/calendarserver/tools/test/test_calverify.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_resourcespy">CalendarServer/trunk/calendarserver/tools/test/test_resources.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_cachepy">CalendarServer/trunk/twistedcaldav/test/test_cache.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_collectioncontentspy">CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_localizationpy">CalendarServer/trunk/twistedcaldav/test/test_localization.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischedulelocalserverspy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/localservers.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_utilspy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_utils.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_utilpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastorepoddingtesttest_conduitpy">CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastorepoddingtestutilpy">CalendarServer/trunk/txdav/common/datastore/podding/test/util.py</a></li>
<li><a href="#CalendarServertrunktxdavwhodirectorypy">CalendarServer/trunk/txdav/who/directory.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotestsupportpy">CalendarServer/trunk/txdav/who/test/support.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoutilpy">CalendarServer/trunk/txdav/who/util.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 (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/calverify.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/calendarserver/tools/calverify.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -724,7 +724,6 @@
</span><span class="cx">         returnValue((caldata, rows[0][1], rows[0][2], rows[0][3],) if rows else (None, None, None, None,))
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def removeEvent(self, resid):
</span><span class="cx">         &quot;&quot;&quot;
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsgatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/gateway.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/gateway.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/calendarserver/tools/gateway.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -222,6 +222,7 @@
</span><span class="cx">     def command_getLocationList(self, command):
</span><span class="cx">         return self.respondWithRecordsOfTypes(self.dir, command, [&quot;locations&quot;])
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def _saveRecord(self, typeName, recordType, command, oldFields=None):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -337,6 +338,7 @@
</span><span class="cx">             oldFields=record.fields
</span><span class="cx">         )
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def command_setResourceAttributes(self, command):
</span><span class="cx">         uid = command['GeneratedUID']
</span><span class="lines">@@ -475,6 +477,7 @@
</span><span class="cx">     def command_listReadProxies(self, command):
</span><span class="cx">         return self._listProxies(command, &quot;read&quot;)
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def _listProxies(self, command, proxyType):
</span><span class="cx">         record = yield recordForPrincipalID(self.dir, command['Principal'])
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsresourcespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/resources.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/resources.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/calendarserver/tools/resources.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -177,9 +177,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
-
-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def migrateResources(sourceService, destService, verbose=False):
</span><span class="cx"> 
</span><span class="lines">@@ -209,6 +206,5 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> if __name__ == &quot;__main__&quot;:
</span><span class="cx">     main()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_agentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_agent.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_agent.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/calendarserver/tools/test/test_agent.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">         def __init__(self, shortName):
</span><span class="cx">             self.shortNames = [shortName]
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx">     class AgentTestCase(TestCase):
</span><span class="cx"> 
</span><span class="cx">         def test_AgentRealm(self):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_calverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_calverify.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_calverify.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/calendarserver/tools/test/test_calverify.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -609,7 +609,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> class CalVerifyMismatchTestsBase(StoreTestCase):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Tests calverify for iCalendar mismatch problems.
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_resourcespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_resources.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_resources.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/calendarserver/tools/test/test_resources.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">     pass
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> class MigrateResourcesTest(StoreTestCase):
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="lines">@@ -67,7 +68,6 @@
</span><span class="cx">         yield self.sourceService.updateRecords(records, create=True)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def test_migrateResources(self):
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_cachepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_cache.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_cache.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/twistedcaldav/test/test_cache.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx">     def oldNameToRecordType(self, oldName):
</span><span class="cx">         return oldName
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx">     def recordWithShortName(self, recordType, recordName):
</span><span class="cx">         return StubDirectoryRecord(recordName)
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_collectioncontentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -191,7 +191,6 @@
</span><span class="cx">             c += 1
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def test_fail_dot_file_put_in_calendar(self):
</span><span class="cx">         &quot;&quot;&quot;
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_localizationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_localization.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_localization.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/twistedcaldav/test/test_localization.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -186,4 +186,3 @@
</span><span class="cx">         self.assertEquals(_remapLanguageCode(&quot;en&quot;), &quot;en&quot;)
</span><span class="cx">         self.assertEquals(_remapLanguageCode(&quot;zh-Hans&quot;), &quot;zh_CN&quot;)
</span><span class="cx">         self.assertEquals(_remapLanguageCode(&quot;zh-Hant&quot;), &quot;zh_TW&quot;)
</span><del>-
</del></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/upgrade.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -333,8 +333,6 @@
</span><span class="cx">         os.rename(oldHome, newHome)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
-
</del><span class="cx">     def createMailTokensDatabase(config, uid, gid):
</span><span class="cx">         # Cause the tokens db to be created on disk so we can set the
</span><span class="cx">         # permissions on it now
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischedulelocalserverspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/localservers.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/localservers.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/localservers.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -132,7 +132,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> class Server(object):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Represents a server.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_utilspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_utils.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_utils.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_utils.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -109,7 +109,6 @@
</span><span class="cx">         yield self.populate()
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def populate(self):
</span><span class="cx">         yield populateCalendarsFrom(self.requirements, self.storeUnderTest())
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -332,7 +332,6 @@
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def test_migrateEmptyHome(self):
</span><span class="cx">         &quot;&quot;&quot;
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastorepoddingtesttest_conduitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx">         yield self.populate()
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def populate(self):
</span><span class="cx">         yield populateCalendarsFrom(self.requirements, self.storeUnderTest())
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastorepoddingtestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/podding/test/util.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/podding/test/util.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/txdav/common/datastore/podding/test/util.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -134,7 +134,6 @@
</span><span class="cx">         FakeConduitRequest.addServerStore(server2b, self.store2)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     def configure(self):
</span><span class="cx">         super(MultiStoreConduitTest, self).configure()
</span><span class="cx">         self.config.Servers.Enabled = True
</span><span class="lines">@@ -183,7 +182,6 @@
</span><span class="cx">         self.otherTransaction = None
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     def makeConduit(self, store):
</span><span class="cx">         conduit = PoddingConduit(store)
</span><span class="cx">         conduit.conduitRequestClass = FakeConduitRequest
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/directory.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/directory.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/txdav/who/directory.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -51,8 +51,6 @@
</span><span class="cx"> 
</span><span class="cx">     guid = &quot;1332A615-4D3A-41FE-B636-FBE25BFB982E&quot;
</span><span class="cx"> 
</span><del>-
-
</del><span class="cx">     serversDB = None
</span><span class="cx"> 
</span><span class="cx">     def setServersDB(self, serversDB):
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotestsupportpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/support.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/support.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/txdav/who/test/support.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">         recordsByUID = dict(((record.uid, record) for record in records))
</span><span class="cx">         if not create:
</span><span class="cx">             # Make sure all the records already exist
</span><del>-            for uid, record in recordsByUID.items():
</del><ins>+            for uid, _ignore_record in recordsByUID.items():
</ins><span class="cx">                 if uid not in self._index[self.fieldName.uid]:
</span><span class="cx">                     raise NoSuchRecordError(uid)
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/util.py (13484 => 13485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/util.py        2014-05-16 01:54:55 UTC (rev 13484)
+++ CalendarServer/trunk/txdav/who/util.py        2014-05-16 14:30:46 UTC (rev 13485)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx">     )
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def buildDirectory(
</span><span class="cx">     store, dataRoot, servicesInfo, augmentServiceInfo, wikiServiceInfo,
</span><span class="cx">     serversDB=None
</span></span></pre>
</div>
</div>

</body>
</html>