<!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>[13307] 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/13307">13307</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-17 09:51:44 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mostly whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverprovisiontesttest_rootpy">CalendarServer/trunk/calendarserver/provision/test/test_root.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolschangeip_calendarpy">CalendarServer/trunk/calendarserver/tools/changeip_calendar.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsprincipalspy">CalendarServer/trunk/calendarserver/tools/principals.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsshelltesttest_vfspy">CalendarServer/trunk/calendarserver/tools/shell/test/test_vfs.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_principalspy">CalendarServer/trunk/calendarserver/tools/test/test_principals.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_purgepy">CalendarServer/trunk/calendarserver/tools/test/test_purge.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsutilpy">CalendarServer/trunk/calendarserver/tools/util.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadmineventsourcepy">CalendarServer/trunk/calendarserver/webadmin/eventsource.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminlogspy">CalendarServer/trunk/calendarserver/webadmin/logs.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipalspy">CalendarServer/trunk/calendarserver/webadmin/principals.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminresourcepy">CalendarServer/trunk/calendarserver/webadmin/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryaddressbookpy">CalendarServer/trunk/twistedcaldav/directory/addressbook.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryprincipalpy">CalendarServer/trunk/twistedcaldav/directory/principal.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryutilpy">CalendarServer/trunk/twistedcaldav/directory/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavlocalizationpy">CalendarServer/trunk/twistedcaldav/localization.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavsharingpy">CalendarServer/trunk/twistedcaldav/sharing.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavutilpy">CalendarServer/trunk/twistedcaldav/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastorequeryfilterpy">CalendarServer/trunk/txdav/carddav/datastore/query/filter.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretesttest_sqlpy">CalendarServer/trunk/txdav/common/datastore/test/test_sql.py</a></li>
<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="#CalendarServertrunktxdavwhotesttest_delegatespy">CalendarServer/trunk/txdav/who/test/test_delegates.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_directorypy">CalendarServer/trunk/txdav/who/test/test_directory.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_groupspy">CalendarServer/trunk/txdav/who/test/test_groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_utilpy">CalendarServer/trunk/txdav/who/test/test_util.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoutilpy">CalendarServer/trunk/txdav/who/util.py</a></li>
<li><a href="#CalendarServertrunktxdavwhowikipy">CalendarServer/trunk/txdav/who/wiki.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverprovisiontesttest_rootpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/provision/test/test_root.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/provision/test/test_root.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/provision/test/test_root.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- resrc, _ignore_segments = (yield maybeDeferred(
</del><ins>+ _ignore_resrc, _ignore_segments = (yield maybeDeferred(
</ins><span class="cx"> self.actualRoot.locateChild, request, ["principals"]
</span><span class="cx"> ))
</span><span class="cx"> raise AssertionError(
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- resrc, _ignore_segments = (yield maybeDeferred(
</del><ins>+ _ignore_resrc, _ignore_segments = (yield maybeDeferred(
</ins><span class="cx"> self.actualRoot.locateChild, request, ["principals"]
</span><span class="cx"> ))
</span><span class="cx"> raise AssertionError(
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- resrc, _ignore_segments = (yield maybeDeferred(
</del><ins>+ _ignore_resrc, _ignore_segments = (yield maybeDeferred(
</ins><span class="cx"> self.actualRoot.locateChild, request, ["principals"]
</span><span class="cx"> ))
</span><span class="cx"> raise AssertionError(
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx">
</span><span class="cx"> request = SimpleStoreRequest(self, "GET", "/principals/")
</span><span class="cx">
</span><del>- resrc, _ignore_segments = (yield maybeDeferred(
</del><ins>+ _ignore_resrc, _ignore_segments = (yield maybeDeferred(
</ins><span class="cx"> self.actualRoot.locateChild, request, ["principals"]
</span><span class="cx"> ))
</span><span class="cx"> self.assertTrue(request.checkedWiki)
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolschangeip_calendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/changeip_calendar.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/changeip_calendar.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/changeip_calendar.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> print(" new-hostname - new FQDN for the server")
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def log(msg):
</span><span class="cx"> serverRoot = serverRootLocation()
</span><span class="cx"> logDir = os.path.join(serverRoot, "Logs")
</span><span class="lines">@@ -66,6 +67,7 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def main():
</span><span class="cx">
</span><span class="cx"> name = os.path.basename(sys.argv[0])
</span><span class="lines">@@ -144,6 +146,7 @@
</span><span class="cx"> return plistlib.readPlistFromString(output)["result"]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def readConfig(configFile=None):
</span><span class="cx"> """
</span><span class="cx"> Ask calendarserver_config for the current configuration
</span><span class="lines">@@ -167,6 +170,7 @@
</span><span class="cx"> return sendCommand(command)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def updateConfig(
</span><span class="cx"> config,
</span><span class="cx"> oldIP, newIP,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/principals.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/principals.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/principals.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> sys.exit(0)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class PrincipalService(WorkerService):
</span><span class="cx"> """
</span><span class="cx"> Executes principals-related functions in a context which has access to the store
</span><span class="lines">@@ -476,7 +477,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 action_listProxies(store, record, *proxyTypes):
</span><span class="cx"> directory = store.directoryService()
</span><span class="lines">@@ -503,6 +503,7 @@
</span><span class="cx"> print("No %s proxies for %s" % (proxyType, prettyRecord(record)))
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_listProxyFor(store, record, *proxyTypes):
</span><span class="cx"> directory = store.directoryService()
</span><span class="lines">@@ -534,6 +535,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _addRemoveProxy(msg, fn, store, record, proxyType, *proxyIDs):
</span><span class="cx"> directory = store.directoryService()
</span><span class="lines">@@ -554,11 +556,13 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_addProxy(store, record, proxyType, *proxyIDs):
</span><span class="cx"> yield _addRemoveProxy("Added", addDelegate, store, record, proxyType, *proxyIDs)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_removeProxy(store, record, *proxyIDs):
</span><span class="cx"> # Write
</span><span class="lines">@@ -621,8 +625,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> def action_getAutoScheduleMode(store, record):
</span><span class="cx"> print(
</span><span class="cx"> "Auto-schedule mode for {record} is {mode}".format(
</span><span class="lines">@@ -635,6 +637,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_setAutoScheduleMode(store, record, autoScheduleMode):
</span><span class="cx"> if record.recordType == RecordType.group:
</span><span class="lines">@@ -672,6 +675,7 @@
</span><span class="cx"> yield record.service.updateRecords([updatedRecord], create=False)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_setAutoAcceptGroup(store, record, autoAcceptGroup):
</span><span class="cx"> if record.recordType == RecordType.group:
</span><span class="lines">@@ -739,6 +743,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_setValue(store, record, name, value):
</span><span class="cx"> print(
</span><span class="lines">@@ -756,6 +761,7 @@
</span><span class="cx"> yield record.service.updateRecords([updatedRecord], create=False)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def action_getValue(store, record, name):
</span><span class="cx"> try:
</span><span class="cx"> value = record.fields[record.service.fieldName.lookupByName(name)]
</span><span class="lines">@@ -772,6 +778,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def printGroupCacherInfo(service, store):
</span><span class="cx"> """
</span><span class="lines">@@ -782,7 +789,7 @@
</span><span class="cx"> txn = store.newTransaction()
</span><span class="cx"> groupUIDs = yield txn.allGroupDelegates()
</span><span class="cx"> for groupUID in groupUIDs:
</span><del>- groupID, name, membershipHash, modified = yield txn.groupByUID(
</del><ins>+ groupID, name, _ignore_membershipHash, modified = yield txn.groupByUID(
</ins><span class="cx"> groupUID
</span><span class="cx"> )
</span><span class="cx"> print("Group: \"{name}\" ({uid})".format(name=name, uid=groupUID))
</span><span class="lines">@@ -874,7 +881,5 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> if __name__ == "__main__":
</span><span class="cx"> main()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsshelltesttest_vfspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/shell/test/test_vfs.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/shell/test/test_vfs.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/shell/test/test_vfs.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -174,7 +174,6 @@
</span><span class="cx"> # )
</span><span class="cx"> # self.folder = UIDsFolder(self.svc, ())
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_list(self):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_principalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -15,7 +15,6 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> import os
</span><del>-import sys
</del><span class="cx">
</span><span class="cx"> from calendarserver.tools.principals import (
</span><span class="cx"> parseCreationArgs, matchStrings,
</span><span class="lines">@@ -193,7 +192,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def test_matchStrings(self):
</span><span class="cx"> self.assertEquals("abc", matchStrings("a", ("abc", "def")))
</span><span class="cx"> self.assertEquals("def", matchStrings("de", ("abc", "def")))
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_purgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_purge.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_purge.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/test/test_purge.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -858,7 +858,6 @@
</span><span class="cx"> yield txn.commit()
</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="CalendarServertrunkcalendarservertoolsutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/util.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -386,6 +386,7 @@
</span><span class="cx"> raise ValueError("Invalid principal identifier: %s" % (principalID,))
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def recordForPrincipalID(directory, principalID, checkOnly=False):
</span><span class="cx">
</span><span class="lines">@@ -549,6 +550,7 @@
</span><span class="cx"> prettyRecord(principal.record)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def prettyRecord(record):
</span><span class="cx"> return "\"{d}\" {uid} ({rt}) {sn}".format(
</span><span class="cx"> d=record.displayName,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadmineventsourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/eventsource.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/eventsource.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/webadmin/eventsource.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -121,6 +121,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class EventSourceResource(Resource):
</span><span class="cx"> """
</span><span class="cx"> Resource that vends HTML5 EventSource events.
</span><span class="lines">@@ -249,7 +250,6 @@
</span><span class="cx"> textAsEvent(eventText, eventID, eventClass, eventRetry)
</span><span class="cx"> )
</span><span class="cx">
</span><del>-
</del><span class="cx"> if eventID is not None:
</span><span class="cx"> # We just scanned all the messages, and none are the last one the
</span><span class="cx"> # client saw.
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminlogspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -155,13 +155,13 @@
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def idForEvent(event):
</span><del>- observer, eventClass, logEvent = event
</del><ins>+ _ignore_observer, _ignore_eventClass, logEvent = event
</ins><span class="cx"> return id(logEvent)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def classForEvent(event):
</span><del>- observer, eventClass, logEvent = event
</del><ins>+ _ignore_observer, eventClass, _ignore_logEvent = event
</ins><span class="cx"> return eventClass
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -301,6 +301,7 @@
</span><span class="cx"> return request._search_terms
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # This should work when we switch to twext.who
</span><span class="cx"> #
</span><span class="lines">@@ -317,6 +318,7 @@
</span><span class="cx"> except UnicodeDecodeError:
</span><span class="cx"> return u"(error rendering value)"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def joinWithBR(elements):
</span><span class="cx"> noValues = True
</span><span class="cx">
</span><span class="lines">@@ -331,7 +333,6 @@
</span><span class="cx"> if noValues:
</span><span class="cx"> yield u"(no values)"
</span><span class="cx">
</span><del>-
</del><span class="cx"> # slots = {}
</span><span class="cx">
</span><span class="cx"> # for field, values in record.fields.iteritems():
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/resource.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -88,12 +88,10 @@
</span><span class="cx">
</span><span class="cx"> # return u""
</span><span class="cx">
</span><del>-
</del><span class="cx"> # @staticmethod
</span><span class="cx"> # def queryValues(request, arguments):
</span><span class="cx"> # return request.args.get(arguments, [])
</span><span class="cx">
</span><del>-
</del><span class="cx"> def __init__(self, elementClass):
</span><span class="cx"> Resource.__init__(self)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/addressbook.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/addressbook.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/directory/addressbook.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -100,7 +100,6 @@
</span><span class="cx"> # FIXME: Smells like a hack
</span><span class="cx"> directory.addressBookHomesCollection = self
</span><span class="cx">
</span><del>-
</del><span class="cx"> #
</span><span class="cx"> # Create children
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryprincipalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -1444,6 +1444,3 @@
</span><span class="cx"> davxml.Protected(),
</span><span class="cx"> ),
</span><span class="cx"> )
</span><del>-
-
-
</del></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/util.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/directory/util.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -154,7 +154,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def formatLink(url):
</span><span class="cx"> """
</span><span class="cx"> Convert a URL string into some twisted.web.template DOM objects for
</span><span class="lines">@@ -171,6 +170,7 @@
</span><span class="cx"> return formatList(formatLink(link) for link in urls)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def formatPrincipals(principals):
</span><span class="cx"> """
</span><span class="cx"> Format a list of principals into some twisted.web.template DOM objects.
</span><span class="lines">@@ -222,5 +222,3 @@
</span><span class="cx"> yield " ** %s **: %s\n" % (e.__class__.__name__, e)
</span><span class="cx"> if not thereAreAny:
</span><span class="cx"> yield " '()\n"
</span><del>-
-
</del></span></pre></div>
<a id="CalendarServertrunktwistedcaldavlocalizationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/localization.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/localization.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/localization.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -484,6 +484,7 @@
</span><span class="cx"> outFile.write(result)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def _remapLanguageCode(code):
</span><span class="cx"> """
</span><span class="cx"> Remap certain language codes to others, per the localization team
</span><span class="lines">@@ -497,6 +498,7 @@
</span><span class="cx"> return code
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def getLanguage(config):
</span><span class="cx"> """
</span><span class="cx"> If the language has been specified explicitly in the config, return it. Otherwise
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavsharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/sharing.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/sharing.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/sharing.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def inviteSingleUserToShare(self, userid, cn, ace, summary, request): #@UnusedVariable
</del><ins>+ def inviteSingleUserToShare(self, userid, cn, ace, summary, request): #@UnusedVariable
</ins><span class="cx">
</span><span class="cx"> # We currently only handle local users
</span><span class="cx"> sharee = yield self.principalForCalendarUserAddress(userid)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -3985,9 +3985,9 @@
</span><span class="cx"> customxml.InReplyTo.fromString(jsondata["in-reply-to"]),
</span><span class="cx"> customxml.InviteSummary.fromString(jsondata["summary"]) if jsondata["summary"] else None,
</span><span class="cx"> customxml.CommonName.fromString(commonName) if commonName else None,
</span><ins>+ **typeAttr
</ins><span class="cx"> # customxml.FirstNameProperty(record.firstName) if record.firstName else None,
</span><span class="cx"> # customxml.LastNameProperty(record.lastName) if record.lastName else None,
</span><del>- **typeAttr
</del><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/util.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/twistedcaldav/util.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -495,7 +495,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def bestAcceptType(accepts, allowedTypes):
</span><span class="cx"> """
</span><span class="cx"> Given a set of Accept headers and the set of types the server can return, determine the best choice
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastorequeryfilterpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/query/filter.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/query/filter.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/carddav/datastore/query/filter.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -253,6 +253,8 @@
</span><span class="cx"> else:
</span><span class="cx"> return not allof
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class PropertyFilter (FilterChildBase):
</span><span class="cx"> """
</span><span class="cx"> Limits a search to specific properties.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -1518,7 +1518,6 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def addDelegateGroup(self, delegator, delegateGroupID, readWrite,
</span><span class="cx"> isExternal=False):
</span><span class="lines">@@ -1550,7 +1549,6 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def removeDelegate(self, delegator, delegate, readWrite):
</span><span class="cx"> """
</span><span class="cx"> Removes a row from the DELEGATES table. The delegate should not be a
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -474,11 +474,12 @@
</span><span class="cx"> self.label = label
</span><span class="cx"> self.action = None
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def commit(self):
</span><span class="cx"> self.action = "committed"
</span><span class="cx"> return succeed(None)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def abort(self):
</span><span class="cx"> self.action = "aborted"
</span><span class="cx"> return succeed(None)
</span><del>-
</del></span></pre></div>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -190,7 +190,6 @@
</span><span class="cx"> # log.warn("Need to change shortName to unicode")
</span><span class="cx"> shortName = shortName.decode("utf-8")
</span><span class="cx">
</span><del>-
</del><span class="cx"> return self._call(
</span><span class="cx"> RecordWithShortNameCommand,
</span><span class="cx"> self._processSingleRecord,
</span><span class="lines">@@ -318,7 +317,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def members(self):
</span><span class="cx"> return self.service._call(
</span><span class="cx"> MembersCommand,
</span><span class="lines">@@ -347,10 +345,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Test client:
</span><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def makeEvenBetterRequest():
</span><span class="cx"> ds = DirectoryService(None)
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpscommandspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/commands.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/commands.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/dps/commands.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class RecordsMatchingTokensCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('tokens', amp.ListOf(amp.String())),
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class RecordsMatchingFieldsCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('fields', amp.ListOf(amp.ListOf(amp.String()))),
</span><span class="lines">@@ -88,6 +90,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class UpdateRecordsCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('fieldsList', amp.String()),
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsjsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/json.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/json.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/dps/json.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> return to_json_text(json)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def expressionAsJSON(expression):
</span><span class="cx"> if isinstance(expression, CompoundExpression):
</span><span class="cx"> return compoundExpressionAsJSON(expression)
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def compoundExpressionAsJSON(expression):
</span><span class="cx"> return dict(
</span><span class="cx"> type=expression.__class__.__name__,
</span><span class="lines">@@ -59,6 +61,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def matchExpressionAsJSON(expression):
</span><span class="cx"> return dict(
</span><span class="cx"> type=expression.__class__.__name__,
</span><span class="lines">@@ -70,11 +73,13 @@
</span><span class="cx"> raise NotImplementedError()
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def expressionFromJSONText(jsonText):
</span><span class="cx"> json = from_json_text(jsonText)
</span><span class="cx"> return expressionFromJSON(json)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def expressionFromJSON(json):
</span><span class="cx"> if not isinstance(json, dict):
</span><span class="cx"> raise TypeError("JSON expression must be a dict.")
</span><span class="lines">@@ -95,6 +100,7 @@
</span><span class="cx"> )
</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 class="lines">@@ -110,6 +116,7 @@
</span><span class="cx"> return CompoundExpression(expressions, operand)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def matchExpressionFromJSON(json):
</span><span class="cx"> try:
</span><span class="cx"> field_json = json["field"]
</span><span class="lines">@@ -136,6 +143,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def to_json_text(obj):
</span><span class="cx"> """
</span><span class="cx"> Convert an object into JSON text.
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_delegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_delegates.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_delegates.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/test/test_delegates.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -207,8 +207,8 @@
</span><span class="cx"> yield self.directory.recordWithShortName(RecordType.user, name)
</span><span class="cx"> )
</span><span class="cx"> newSet.add(record.uid)
</span><del>- groupID, name, membershipHash, modified = (yield txn.groupByUID(group1.uid))
- numAdded, numRemoved = (
</del><ins>+ groupID, name, _ignore_membershipHash, _ignore_modified = (yield txn.groupByUID(group1.uid))
+ _ignore_numAdded, _ignore_numRemoved = (
</ins><span class="cx"> yield self.groupCacher.synchronizeMembers(txn, groupID, newSet)
</span><span class="cx"> )
</span><span class="cx"> delegates = (yield delegatesOf(txn, delegator, True, expanded=True))
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_directory.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_directory.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/test/test_directory.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class DirectoryTestCase(StoreTestCase):
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -69,7 +70,6 @@
</span><span class="cx"> u"/principals/__uids__/uid/"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-
</del><span class="cx"> record = TestDirectoryRecord(
</span><span class="cx"> self.directory,
</span><span class="cx"> {
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> u"mailto:test@example.com"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-
</del><span class="cx"> record = TestDirectoryRecord(
</span><span class="cx"> self.directory,
</span><span class="cx"> {
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_groupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_groups.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_groups.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/test/test_groups.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> txn = store.newTransaction()
</span><span class="cx">
</span><span class="cx"> record = yield self.directory.recordWithUID(u"__top_group_1__")
</span><del>- groupID, name, membershipHash, modified = (yield txn.groupByUID(record.uid))
- groupID, name, membershipHash, modified = (yield txn.groupByUID(record.uid))
</del><ins>+ _ignore_groupID, _ignore_name, _ignore_membershipHash, _ignore_modified = (yield txn.groupByUID(record.uid))
+ _ignore_groupID, _ignore_name, _ignore_membershipHash, _ignore_modified = (yield txn.groupByUID(record.uid))
</ins><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_util.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/test/test_util.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -158,7 +158,6 @@
</span><span class="cx"> set([WikiRecordType.macOSXServerWiki])
</span><span class="cx"> )
</span><span class="cx">
</span><del>-
</del><span class="cx"> # And make sure it's functional:
</span><span class="cx"> record = yield service.recordWithUID("group07")
</span><span class="cx"> self.assertEquals(record.fullNames, [u'Group 07'])
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/util.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/util.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/util.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -61,12 +61,11 @@
</span><span class="cx"> # TODO: use proxyForInterface to ensure we're only using the DPS related
</span><span class="cx"> # store API. Also define an IDirectoryProxyStore Interface
</span><span class="cx"> if store is None:
</span><del>- pool, txnFactory = getDBPool(config)
</del><ins>+ _ignore_pool, txnFactory = getDBPool(config)
</ins><span class="cx"> store = storeFromConfig(config, txnFactory, None)
</span><span class="cx">
</span><span class="cx"> aggregatedServices = []
</span><span class="cx">
</span><del>-
</del><span class="cx"> for serviceKey in ("DirectoryService", "ResourceService"):
</span><span class="cx"> serviceValue = config.get(serviceKey, None)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhowikipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/wiki.py (13306 => 13307)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/wiki.py 2014-04-17 15:55:25 UTC (rev 13306)
+++ CalendarServer/trunk/txdav/who/wiki.py 2014-04-17 16:51:44 UTC (rev 13307)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: Should this be Flags?
</span><span class="cx"> class WikiAccessLevel(Names):
</span><del>- none = NamedConstant()
- read = NamedConstant()
</del><ins>+ none = NamedConstant()
+ read = NamedConstant()
</ins><span class="cx"> write = NamedConstant()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -219,6 +219,7 @@
</span><span class="cx"> returnValue(WikiAccessLevel.none)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def getWikiACL(resource, request):
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>