<!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>[13035] CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/storebridge.py</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/13035">13035</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 14:42:29 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sprinkle in some yields, comment out first/last name</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavstorebridgepy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/storebridge.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/storebridge.py (13034 => 13035)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/storebridge.py        2014-03-28 21:41:57 UTC (rev 13034)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/storebridge.py        2014-03-28 21:42:29 UTC (rev 13035)
</span><span class="lines">@@ -1613,7 +1613,7 @@
</span><span class="cx"> cuas = (yield self._newStoreCalendarObject.component()).getAttendees()
</span><span class="cx"> newACEs = []
</span><span class="cx"> for calendarUserAddress in cuas:
</span><del>- principal = self.principalForCalendarUserAddress(
</del><ins>+ principal = yield self.principalForCalendarUserAddress(
</ins><span class="cx"> calendarUserAddress
</span><span class="cx"> )
</span><span class="cx"> if principal is None:
</span><span class="lines">@@ -1683,7 +1683,7 @@
</span><span class="cx"> proxyprivs = list(userprivs)
</span><span class="cx"> proxyprivs.remove(davxml.Privilege(davxml.ReadACL()))
</span><span class="cx">
</span><del>- principal = self.principalForUID(invite.shareeUID)
</del><ins>+ principal = yield self.principalForUID(invite.shareeUID)
</ins><span class="cx"> aces += (
</span><span class="cx"> # Inheritable specific access for the resource's associated principal.
</span><span class="cx"> davxml.ACE(
</span><span class="lines">@@ -1941,7 +1941,7 @@
</span><span class="cx"> cuas = (yield self._newStoreCalendarObject.component()).getAttendees()
</span><span class="cx"> newACEs = []
</span><span class="cx"> for calendarUserAddress in cuas:
</span><del>- principal = self.principalForCalendarUserAddress(
</del><ins>+ principal = yield self.principalForCalendarUserAddress(
</ins><span class="cx"> calendarUserAddress
</span><span class="cx"> )
</span><span class="cx"> if principal is None:
</span><span class="lines">@@ -2038,7 +2038,7 @@
</span><span class="cx"> if access in ("read-only", "read-write",):
</span><span class="cx"> userprivs.extend(privileges)
</span><span class="cx">
</span><del>- principal = self.principalForUID(invite.shareeUID)
</del><ins>+ principal = yield self.principalForUID(invite.shareeUID)
</ins><span class="cx"> aces += (
</span><span class="cx"> # Inheritable specific access for the resource's associated principal.
</span><span class="cx"> davxml.ACE(
</span><span class="lines">@@ -3707,7 +3707,7 @@
</span><span class="cx"> else:
</span><span class="cx"> userprivs.append(davxml.Privilege(davxml.WriteProperties()))
</span><span class="cx">
</span><del>- sharee = self.principalForUID(self._newStoreObject.viewerHome().uid())
</del><ins>+ sharee = yield self.principalForUID(self._newStoreObject.viewerHome().uid())
</ins><span class="cx"> aces = (
</span><span class="cx"> # Inheritable specific access for the resource's associated principal.
</span><span class="cx"> davxml.ACE(
</span><span class="lines">@@ -3909,7 +3909,7 @@
</span><span class="cx"> assert ignored is None, "This is a notification object, not a notification"
</span><span class="cx"> jsondata = (yield self._newStoreObject.notificationData())
</span><span class="cx"> if jsondata["notification-type"] == "invite-notification":
</span><del>- ownerPrincipal = self.principalForUID(jsondata["owner"])
</del><ins>+ ownerPrincipal = yield self.principalForUID(jsondata["owner"])
</ins><span class="cx"> ownerCN = ownerPrincipal.displayName()
</span><span class="cx"> ownerHomeURL = ownerPrincipal.calendarHomeURLs()[0] if jsondata["shared-type"] == "calendar" else ownerPrincipal.addressBookHomeURLs()[0]
</span><span class="cx">
</span><span class="lines">@@ -3919,7 +3919,7 @@
</span><span class="cx"> else:
</span><span class="cx"> owner = "urn:uuid:" + ownerPrincipal.principalUID()
</span><span class="cx">
</span><del>- shareePrincipal = self.principalForUID(jsondata["sharee"])
</del><ins>+ shareePrincipal = yield self.principalForUID(jsondata["sharee"])
</ins><span class="cx">
</span><span class="cx"> if "supported-components" in jsondata:
</span><span class="cx"> comps = jsondata["supported-components"]
</span><span class="lines">@@ -3954,10 +3954,10 @@
</span><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx"> elif jsondata["notification-type"] == "invite-reply":
</span><del>- ownerPrincipal = self.principalForUID(jsondata["owner"])
</del><ins>+ ownerPrincipal = yield self.principalForUID(jsondata["owner"])
</ins><span class="cx"> ownerHomeURL = ownerPrincipal.calendarHomeURLs()[0] if jsondata["shared-type"] == "calendar" else ownerPrincipal.addressBookHomeURLs()[0]
</span><span class="cx">
</span><del>- shareePrincipal = self.principalForUID(jsondata["sharee"])
</del><ins>+ shareePrincipal = yield self.principalForUID(jsondata["sharee"])
</ins><span class="cx">
</span><span class="cx"> # FIXME: use urn:uuid always?
</span><span class="cx"> if jsondata["shared-type"] == "calendar":
</span><span class="lines">@@ -3985,8 +3985,8 @@
</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><del>- customxml.FirstNameProperty(record.firstName) if record.firstName else None,
- customxml.LastNameProperty(record.lastName) if record.lastName else None,
</del><ins>+ # customxml.FirstNameProperty(record.firstName) if record.firstName else None,
+ # customxml.LastNameProperty(record.lastName) if record.lastName else None,
</ins><span class="cx"> #**typeAttr
</span><span class="cx"> ),
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>