<!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>[13718] 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/13718">13718</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-03 11:26:34 -0700 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Missing yields.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsdbinspectpy">CalendarServer/trunk/calendarserver/tools/dbinspect.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsgatewaypy">CalendarServer/trunk/calendarserver/tools/gateway.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsshellcmdpy">CalendarServer/trunk/calendarserver/tools/shell/cmd.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsshelldirectorypy">CalendarServer/trunk/calendarserver/tools/shell/directory.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsshellvfspy">CalendarServer/trunk/calendarserver/tools/shell/vfs.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryaugmentpy">CalendarServer/trunk/twistedcaldav/directory/augment.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy">CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorydigestpy">CalendarServer/trunk/twistedcaldav/directory/digest.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavscheduling_storecaldavresourcepy">CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulepy">CalendarServer/trunk/txdav/caldav/datastore/schedule.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoresqlpy">CalendarServer/trunk/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoaugmentpy">CalendarServer/trunk/txdav/who/augment.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsdbinspectpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/dbinspect.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/dbinspect.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/calendarserver/tools/dbinspect.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -96,26 +96,27 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+@inlineCallbacks
</ins><span class="cx"> def UserNameFromUID(txn, uid):
</span><del>- record = txn.directoryService().recordWithGUID(uid)
- return record.shortNames[0] if record else "(%s)" % (uid,)
</del><ins>+ record = yield txn.directoryService().recordWithGUID(uid)
+ returnValue(record.shortNames[0] if record else "(%s)" % (uid,))
</ins><span class="cx">
</span><span class="cx">
</span><del>-
</del><ins>+@inlineCallbacks
</ins><span class="cx"> def UIDFromInput(txn, value):
</span><span class="cx"> try:
</span><span class="cx"> return str(UUID(value)).upper()
</span><span class="cx"> except (ValueError, TypeError):
</span><span class="cx"> pass
</span><span class="cx">
</span><del>- record = txn.directoryService().recordWithShortName(RecordType.user, value)
</del><ins>+ record = yield txn.directoryService().recordWithShortName(RecordType.user, value)
</ins><span class="cx"> if record is None:
</span><del>- record = txn.directoryService().recordWithShortName(CalRecordType.location, value)
</del><ins>+ record = yield txn.directoryService().recordWithShortName(CalRecordType.location, value)
</ins><span class="cx"> if record is None:
</span><del>- record = txn.directoryService().recordWithShortName(CalRecordType.resource, value)
</del><ins>+ record = yield txn.directoryService().recordWithShortName(CalRecordType.resource, value)
</ins><span class="cx"> if record is None:
</span><del>- record = txn.directoryService().recordWithShortName(RecordType.group, value)
- return record.guid if record else None
</del><ins>+ record = yield txn.directoryService().recordWithShortName(RecordType.group, value)
+ returnValue(record.guid if record else None)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -184,7 +185,7 @@
</span><span class="cx"> table = tables.Table()
</span><span class="cx"> table.addHeader(("Owner UID", "Short Name"))
</span><span class="cx"> for uid in sorted(uids):
</span><del>- shortname = UserNameFromUID(txn, uid)
</del><ins>+ shortname = yield UserNameFromUID(txn, uid)
</ins><span class="cx"> if shortname.startswith("("):
</span><span class="cx"> missing += 1
</span><span class="cx"> table.addRow((
</span><span class="lines">@@ -230,7 +231,7 @@
</span><span class="cx"> table.addHeader(("Owner UID", "Short Name", "Calendars", "Resources"))
</span><span class="cx"> totals = [0, 0, 0]
</span><span class="cx"> for uid in sorted(results.keys()):
</span><del>- shortname = UserNameFromUID(txn, uid)
</del><ins>+ shortname = yield UserNameFromUID(txn, uid)
</ins><span class="cx"> table.addRow((
</span><span class="cx"> uid,
</span><span class="cx"> shortname,
</span><span class="lines">@@ -287,7 +288,7 @@
</span><span class="cx"> table = tables.Table()
</span><span class="cx"> table.addHeader(("Owner UID", "Short Name", "Calendar", "Resources"))
</span><span class="cx"> for uid, calname, count in sorted(uids, key=lambda x: (x[0], x[1])):
</span><del>- shortname = UserNameFromUID(txn, uid)
</del><ins>+ shortname = yield UserNameFromUID(txn, uid)
</ins><span class="cx"> table.addRow((
</span><span class="cx"> uid,
</span><span class="cx"> shortname,
</span><span class="lines">@@ -329,7 +330,7 @@
</span><span class="cx"> def doIt(self, txn):
</span><span class="cx">
</span><span class="cx"> uid = raw_input("Owner UID/Name: ")
</span><del>- uid = UIDFromInput(txn, uid)
</del><ins>+ uid = yield UIDFromInput(txn, uid)
</ins><span class="cx"> uids = yield self.getCalendars(txn, uid)
</span><span class="cx">
</span><span class="cx"> # Print table of results
</span><span class="lines">@@ -337,7 +338,7 @@
</span><span class="cx"> table.addHeader(("Owner UID", "Short Name", "Calendars", "ID", "Resources"))
</span><span class="cx"> totals = [0, 0, ]
</span><span class="cx"> for uid, calname, resid, count in sorted(uids, key=lambda x: x[1]):
</span><del>- shortname = UserNameFromUID(txn, uid)
</del><ins>+ shortname = yield UserNameFromUID(txn, uid)
</ins><span class="cx"> table.addRow((
</span><span class="cx"> uid if totals[0] == 0 else "",
</span><span class="cx"> shortname if totals[0] == 0 else "",
</span><span class="lines">@@ -390,7 +391,7 @@
</span><span class="cx"> table = tables.Table()
</span><span class="cx"> table.addHeader(("Owner UID", "Short Name", "Calendar", "ID", "Type", "UID"))
</span><span class="cx"> for uid, calname, id, caltype, caluid in sorted(uids, key=lambda x: (x[0], x[1])):
</span><del>- shortname = UserNameFromUID(txn, uid)
</del><ins>+ shortname = yield UserNameFromUID(txn, uid)
</ins><span class="cx"> table.addRow((
</span><span class="cx"> uid,
</span><span class="cx"> shortname,
</span><span class="lines">@@ -484,9 +485,10 @@
</span><span class="cx"> """
</span><span class="cx"> Base class for common event details commands.
</span><span class="cx"> """
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def printEventDetails(self, txn, details):
</span><span class="cx"> owner, calendar, resource_id, resource, created, modified, data = details
</span><del>- shortname = UserNameFromUID(txn, owner)
</del><ins>+ shortname = yield UserNameFromUID(txn, owner)
</ins><span class="cx"> table = tables.Table()
</span><span class="cx"> table.addRow(("Owner UID:", owner,))
</span><span class="cx"> table.addRow(("User Name:", shortname,))
</span><span class="lines">@@ -540,7 +542,7 @@
</span><span class="cx"> returnValue(None)
</span><span class="cx"> result = yield self.getData(txn, rid)
</span><span class="cx"> if result:
</span><del>- self.printEventDetails(txn, result[0])
</del><ins>+ yield self.printEventDetails(txn, result[0])
</ins><span class="cx"> else:
</span><span class="cx"> print("Could not find resource")
</span><span class="cx">
</span><span class="lines">@@ -562,7 +564,7 @@
</span><span class="cx"> rows = yield self.getData(txn, uid)
</span><span class="cx"> if rows:
</span><span class="cx"> for result in rows:
</span><del>- self.printEventDetails(txn, result)
</del><ins>+ yield self.printEventDetails(txn, result)
</ins><span class="cx"> else:
</span><span class="cx"> print("Could not find icalendar data")
</span><span class="cx">
</span><span class="lines">@@ -584,7 +586,7 @@
</span><span class="cx"> rows = yield self.getData(txn, name)
</span><span class="cx"> if rows:
</span><span class="cx"> for result in rows:
</span><del>- self.printEventDetails(txn, result)
</del><ins>+ yield self.printEventDetails(txn, result)
</ins><span class="cx"> else:
</span><span class="cx"> print("Could not find icalendar data")
</span><span class="cx">
</span><span class="lines">@@ -603,11 +605,11 @@
</span><span class="cx"> def doIt(self, txn):
</span><span class="cx">
</span><span class="cx"> uid = raw_input("Owner UID/Name: ")
</span><del>- uid = UIDFromInput(txn, uid)
</del><ins>+ uid = yield UIDFromInput(txn, uid)
</ins><span class="cx"> rows = yield self.getData(txn, uid)
</span><span class="cx"> if rows:
</span><span class="cx"> for result in rows:
</span><del>- self.printEventDetails(txn, result)
</del><ins>+ yield self.printEventDetails(txn, result)
</ins><span class="cx"> else:
</span><span class="cx"> print("Could not find icalendar data")
</span><span class="cx">
</span><span class="lines">@@ -626,12 +628,12 @@
</span><span class="cx"> def doIt(self, txn):
</span><span class="cx">
</span><span class="cx"> uid = raw_input("Owner UID/Name: ")
</span><del>- uid = UIDFromInput(txn, uid)
</del><ins>+ uid = yield UIDFromInput(txn, uid)
</ins><span class="cx"> name = raw_input("Calendar resource name: ")
</span><span class="cx"> rows = yield self.getData(txn, uid, name)
</span><span class="cx"> if rows:
</span><span class="cx"> for result in rows:
</span><del>- self.printEventDetails(txn, result)
</del><ins>+ yield self.printEventDetails(txn, result)
</ins><span class="cx"> else:
</span><span class="cx"> print("Could not find icalendar data")
</span><span class="cx">
</span><span class="lines">@@ -661,7 +663,7 @@
</span><span class="cx"> rows = yield self.getData(txn, homeName, calendarName, resourceName)
</span><span class="cx"> if rows:
</span><span class="cx"> for result in rows:
</span><del>- self.printEventDetails(txn, result)
</del><ins>+ yield self.printEventDetails(txn, result)
</ins><span class="cx"> else:
</span><span class="cx"> print("Could not find icalendar data")
</span><span class="cx">
</span><span class="lines">@@ -693,7 +695,7 @@
</span><span class="cx"> rows = yield self.getData(txn, uid)
</span><span class="cx"> if rows:
</span><span class="cx"> for result in rows:
</span><del>- self.printEventDetails(txn, result)
</del><ins>+ yield self.printEventDetails(txn, result)
</ins><span class="cx"> else:
</span><span class="cx"> print("Could not find icalendar data")
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsgatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/gateway.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/gateway.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/calendarserver/tools/gateway.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> self.respondWithError("Principal not found: %s" % (uid,))
</span><span class="cx"> return
</span><span class="cx"> recordDict = recordToDict(record)
</span><del>- # recordDict['AutoSchedule'] = principal.getAutoSchedule()
</del><ins>+ # recordDict['AutoSchedule'] = yield principal.getAutoSchedule()
</ins><span class="cx"> try:
</span><span class="cx"> recordDict['AutoAcceptGroup'] = record.autoAcceptGroup
</span><span class="cx"> except AttributeError:
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> # Resources
</span><span class="cx">
</span><span class="cx"> def command_getResourceList(self, command):
</span><del>- self.respondWithRecordsOfTypes(self.dir, command, ["resources"])
</del><ins>+ return self.respondWithRecordsOfTypes(self.dir, command, ["resources"])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # deferred
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> def _delete(self, typeName, command):
</span><span class="cx"> uid = command['GeneratedUID']
</span><span class="cx"> yield self.dir.removeRecords([uid])
</span><del>- self.respondWithRecordsOfTypes(self.dir, command, [typeName])
</del><ins>+ yield self.respondWithRecordsOfTypes(self.dir, command, [typeName])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsshellcmdpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/shell/cmd.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/shell/cmd.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/calendarserver/tools/shell/cmd.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -163,6 +163,7 @@
</span><span class="cx"> returnValue(())
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def directoryRecordWithID(self, id):
</span><span class="cx"> """
</span><span class="cx"> Obtains a directory record corresponding to the given C{id}.
</span><span class="lines">@@ -173,7 +174,7 @@
</span><span class="cx"> """
</span><span class="cx"> directory = self.protocol.service.directory
</span><span class="cx">
</span><del>- record = directory.recordWithUID(id)
</del><ins>+ record = yield directory.recordWithUID(id)
</ins><span class="cx">
</span><span class="cx"> if not record:
</span><span class="cx"> # Try type:name form
</span><span class="lines">@@ -182,9 +183,9 @@
</span><span class="cx"> except ValueError:
</span><span class="cx"> pass
</span><span class="cx"> else:
</span><del>- record = directory.recordWithShortName(recordType, shortName)
</del><ins>+ record = yield directory.recordWithShortName(recordType, shortName)
</ins><span class="cx">
</span><del>- return record
</del><ins>+ returnValue(record)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def commands(self, showHidden=False):
</span><span class="lines">@@ -628,7 +629,7 @@
</span><span class="cx">
</span><span class="cx"> directory = self.protocol.service.directory
</span><span class="cx">
</span><del>- record = self.directoryRecordWithID(id)
</del><ins>+ record = yield self.directoryRecordWithID(id)
</ins><span class="cx">
</span><span class="cx"> if record:
</span><span class="cx"> self.terminal.write((yield recordInfo(directory, record)))
</span><span class="lines">@@ -657,7 +658,7 @@
</span><span class="cx">
</span><span class="cx"> records = []
</span><span class="cx"> for id in tokens:
</span><del>- record = self.directoryRecordWithID(id)
</del><ins>+ record = yield self.directoryRecordWithID(id)
</ins><span class="cx"> records.append(record)
</span><span class="cx">
</span><span class="cx"> if not record:
</span><span class="lines">@@ -701,6 +702,7 @@
</span><span class="cx"> # Sharing
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def cmd_share(self, tokens):
</span><span class="cx"> """
</span><span class="cx"> Share a resource with a principal.
</span><span class="lines">@@ -715,12 +717,12 @@
</span><span class="cx"> mode = tokens.pop(0)
</span><span class="cx"> principalID = tokens.pop(0)
</span><span class="cx">
</span><del>- record = self.directoryRecordWithID(principalID)
</del><ins>+ record = yield self.directoryRecordWithID(principalID)
</ins><span class="cx">
</span><span class="cx"> if not record:
</span><span class="cx"> self.terminal.write("Principal not found: %s\n" % (principalID,))
</span><span class="cx">
</span><del>- targets = self.getTargets(tokens)
</del><ins>+ targets = yield self.getTargets(tokens)
</ins><span class="cx">
</span><span class="cx"> if mode == "r":
</span><span class="cx"> mode = None
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsshelldirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/shell/directory.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/shell/directory.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/calendarserver/tools/shell/directory.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> # I don't know how to get DirectoryRecord objects for the proxyUID here, so, let's cheat for now.
</span><span class="cx"> proxyUID, proxyType = proxyUID.split("#")
</span><span class="cx"> if (proxyUID, proxyType) not in proxyInfoSeen:
</span><del>- proxyRecord = directory.recordWithUID(proxyUID)
</del><ins>+ proxyRecord = yield directory.recordWithUID(proxyUID)
</ins><span class="cx"> rows.append((proxyUID, proxyRecord.recordType, proxyRecord.shortNames[0], proxyRecord.fullName, proxyType))
</span><span class="cx"> proxyInfoSeen.add((proxyUID, proxyType))
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsshellvfspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/shell/vfs.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/shell/vfs.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/calendarserver/tools/shell/vfs.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -290,10 +290,11 @@
</span><span class="cx"> # FIXME: Merge in directory UIDs also?
</span><span class="cx"> # FIXME: Add directory info (eg. name) to list entry
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def addResult(ignoredTxn, home):
</span><span class="cx"> uid = home.uid()
</span><span class="cx">
</span><del>- record = self.service.directory.recordWithUID(uid)
</del><ins>+ record = yield self.service.directory.recordWithUID(uid)
</ins><span class="cx"> if record:
</span><span class="cx"> info = {
</span><span class="cx"> "Record Type": record.recordType,
</span><span class="lines">@@ -331,12 +332,13 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def list(self):
</span><span class="cx"> names = set()
</span><span class="cx">
</span><del>- for record in self.service.directory.recordsWithRecordType(
</del><ins>+ for record in (yield self.service.directory.recordsWithRecordType(
</ins><span class="cx"> self.recordType
</span><del>- ):
</del><ins>+ )):
</ins><span class="cx"> for shortName in record.shortNames:
</span><span class="cx"> if shortName in names:
</span><span class="cx"> continue
</span><span class="lines">@@ -395,6 +397,7 @@
</span><span class="cx"> Folder.__init__(self, service, path)
</span><span class="cx">
</span><span class="cx"> if record is None:
</span><ins>+ # FIXME: recordWithUID returns a Deferred but we cannot return or yield it in an __init__ method
</ins><span class="cx"> record = self.service.directory.recordWithUID(uid)
</span><span class="cx">
</span><span class="cx"> if record is not None:
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -1477,7 +1477,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Finally, re-retrieve the event to update the etag
</span><del>- self._updateEvent(response, href)
</del><ins>+ yield self._updateEvent(response, href)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/requirements-dev.txt 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -7,4 +7,4 @@
</span><span class="cx"> mockldap
</span><span class="cx"> q
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13714#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13716#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/requirements-stable.txt 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> # For CalendarServer development, don't try to get these projects from PyPI; use svn.
</span><span class="cx">
</span><span class="cx"> -e .
</span><del>--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13696#egg=twextpy
</del><ins>+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13717#egg=twextpy
</ins><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
</span><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13711#egg=pycalendar
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectoryaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/augment.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/twistedcaldav/directory/augment.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -504,8 +504,7 @@
</span><span class="cx"> Remove all records.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- self.removeAugmentRecords(self.db.keys())
- return succeed(None)
</del><ins>+ return self.removeAugmentRecords(self.db.keys())
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _shouldReparse(self, xmlFiles):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx"> yield self.open()
</span><span class="cx">
</span><span class="cx"> for group in [row[0] for row in (yield self.query("select GROUPNAME from GROUPS"))]:
</span><del>- self.removeGroup(group)
</del><ins>+ yield self.removeGroup(group)
</ins><span class="cx">
</span><span class="cx"> yield super(ProxyDB, self).clean()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorydigestpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/digest.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/digest.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/twistedcaldav/directory/digest.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -167,8 +167,7 @@
</span><span class="cx"> header.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- challenge = yield (super(QopDigestCredentialFactory, self)
- .getChallenge(peer))
</del><ins>+ challenge = yield (super(QopDigestCredentialFactory, self).getChallenge(peer))
</ins><span class="cx"> c = challenge['nonce']
</span><span class="cx">
</span><span class="cx"> # Make sure it is not a duplicate
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -1884,7 +1884,7 @@
</span><span class="cx"> ))
</span><span class="cx">
</span><span class="cx"> # elif name == "auto-schedule" and self.calendarsEnabled():
</span><del>- # autoSchedule = self.getAutoSchedule()
</del><ins>+ # autoSchedule = yield self.getAutoSchedule()
</ins><span class="cx"> # returnValue(customxml.AutoSchedule("true" if autoSchedule else "false"))
</span><span class="cx">
</span><span class="cx"> elif name == "auto-schedule-mode" and self.calendarsEnabled():
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavscheduling_storecaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -541,7 +541,8 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> else:
</span><del>- returnValue(super(ScheduleOutboxResource, self).defaultAccessControlList())
</del><ins>+ result = yield super(ScheduleOutboxResource, self).defaultAccessControlList()
+ returnValue(result)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def report_urn_ietf_params_xml_ns_caldav_calendar_query(self, request, calendar_query):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -3804,7 +3804,7 @@
</span><span class="cx"> @return: a sequence of the names of all known children of this resource.
</span><span class="cx"> """
</span><span class="cx"> children = set(self.putChildren.keys())
</span><del>- children.update(self._newStoreNotifications.listNotificationObjects())
</del><ins>+ children.update((yield self._newStoreNotifications.listNotificationObjects()))
</ins><span class="cx"> returnValue(children)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/schedule.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/schedule.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/txdav/caldav/datastore/schedule.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -43,8 +43,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def calendarHomeWithUID(self, uid, create=False):
</span><span class="cx"> # FIXME: 'create' flag
</span><del>- newHome = yield super(ImplicitTransaction, self
- ).calendarHomeWithUID(uid, create)
</del><ins>+ newHome = yield super(ImplicitTransaction, self).calendarHomeWithUID(uid, create)
</ins><span class="cx"> # return ImplicitCalendarHome(newHome, self)
</span><span class="cx"> if newHome is None:
</span><span class="cx"> returnValue(None)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> if send_reply:
</span><span class="cx"> # Track outstanding auto-reply processing
</span><span class="cx"> log.debug("ImplicitProcessing - recipient '%s' processing UID: '%s' - auto-reply queued" % (self.recipient.cuaddr, self.uid,))
</span><del>- ScheduleAutoReplyWork.autoReply(self.txn, new_resource, partstat)
</del><ins>+ yield ScheduleAutoReplyWork.autoReply(self.txn, new_resource, partstat)
</ins><span class="cx">
</span><span class="cx"> # Build the schedule-changes XML element
</span><span class="cx"> changes = customxml.ScheduleChanges(
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> if send_reply:
</span><span class="cx"> # Track outstanding auto-reply processing
</span><span class="cx"> log.debug("ImplicitProcessing - recipient '%s' processing UID: '%s' - auto-reply queued" % (self.recipient.cuaddr, self.uid,))
</span><del>- ScheduleAutoReplyWork.autoReply(self.txn, new_resource, partstat)
</del><ins>+ yield ScheduleAutoReplyWork.autoReply(self.txn, new_resource, partstat)
</ins><span class="cx">
</span><span class="cx"> # Build the schedule-changes XML element
</span><span class="cx"> update_details = []
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/sql.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> Unbinds any collections that have been shared to this home but not yet
</span><span class="cx"> accepted. Associated invite entries are also removed.
</span><span class="cx"> """
</span><del>- super(AddressBookHome, self).removeUnacceptedShares()
</del><ins>+ yield super(AddressBookHome, self).removeUnacceptedShares()
</ins><span class="cx">
</span><span class="cx"> # Remove group binds too
</span><span class="cx"> bind = AddressBookObject._bindSchema
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx"> self.ownerHome()._addressbookPropertyStoreID, # not ._resourceID as in CommonHomeChild._loadPropertyStore()
</span><span class="cx"> notifyCallback=self.notifyPropertyChanged
</span><span class="cx"> )
</span><del>- super(AddressBook, self)._loadPropertyStore(props)
</del><ins>+ yield super(AddressBook, self)._loadPropertyStore(props)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def initPropertyStore(self, props):
</span><span class="lines">@@ -868,7 +868,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def removedObjectResource(self, child):
</span><span class="cx"> """
</span><del>- just like CommonHomeChild.removedObjectResource() but does not call self._deleteRevision()
</del><ins>+ Just like CommonHomeChild.removedObjectResource() but does not call self._deleteRevision()
</ins><span class="cx"> """
</span><span class="cx"> self._objects.pop(child.name(), None)
</span><span class="cx"> self._objects.pop(child.uid(), None)
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/augment.py (13717 => 13718)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/augment.py 2014-07-03 18:22:35 UTC (rev 13717)
+++ CalendarServer/trunk/txdav/who/augment.py 2014-07-03 18:26:34 UTC (rev 13718)
</span><span class="lines">@@ -320,9 +320,10 @@
</span><span class="cx"> return (baseFields, augmentFields)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def removeRecords(self, uids):
</span><del>- self._augmentDB.removeAugmentRecords(uids)
- return self._directory.removeRecords(uids)
</del><ins>+ yield self._augmentDB.removeAugmentRecords(uids)
+ yield self._directory.removeRecords(uids)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _assignToField(self, fields, name, value):
</span></span></pre>
</div>
</div>
</body>
</html>