[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [13043] CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method
From: source_changes () macosforge ! org
Date: 2014-03-29 1:34:33
Message-ID: 20140329013433.6FA4E140495 () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 13043
http://trac.calendarserver.org//changeset/13043
Author: sagen@apple.com
Date: 2014-03-28 18:34:33 -0700 (Fri, 28 Mar 2014)
Log Message:
-----------
yield
Modified Paths:
--------------
CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.py
Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.py 2014-03-29 \
01:34:13 UTC (rev 13042)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.py 2014-03-29 \
01:34:33 UTC (rev 13043) @@ -503,7 +503,7 @@
returnValue(matchtotal)
# May need organizer principal
- organizer_principal = calresource.principalForCalendarUserAddress(organizer) if \
organizer else None + organizer_principal = (yield \
calresource.principalForCalendarUserAddress(organizer)) if organizer \
else None
organizer_uid = organizer_principal.principalUID() if organizer_principal else \
""
# Free busy is per-user
@@ -630,7 +630,7 @@
if excludeuid:
# See if we have a UID match
if (excludeuid == uid):
- test_principal = \
calresource.principalForCalendarUserAddress(test_organizer) if test_organizer else \
None + test_principal = (yield \
calresource.principalForCalendarUserAddress(test_organizer)) if test_organizer else \
None
test_uid = test_principal.principalUID() if test_principal \
else ""
# Check that ORGANIZER's match (security requirement)
@@ -688,7 +688,7 @@
# See if we have a UID match
if (excludeuid == uid):
test_organizer = calendar.getOrganizer()
- test_principal = \
calresource.principalForCalendarUserAddress(test_organizer) if test_organizer else \
None + test_principal = (yield \
calresource.principalForCalendarUserAddress(test_organizer)) if test_organizer else \
None
test_uid = test_principal.principalUID() if test_principal else \
""
# Check that ORGANIZER's match (security requirement)
[Attachment #5 (text/html)]
<!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>[13043] CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.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/13043">13043</a></dd> <dt>Author</dt> \
<dd>sagen@apple.com</dd> <dt>Date</dt> <dd>2014-03-28 18:34:33 -0700 (Fri, 28 Mar \
2014)</dd> </dl>
<h3>Log Message</h3>
<pre>yield</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavmethodreport_commo \
npy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavmethodreport_commonpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.py \
(13042 => 13043)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.py 2014-03-29 \
01:34:13 UTC (rev 13042)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_common.py 2014-03-29 \
01:34:33 UTC (rev 13043) </span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx"> returnValue(matchtotal)
</span><span class="cx">
</span><span class="cx"> # May need organizer principal
</span><del>- organizer_principal = \
calresource.principalForCalendarUserAddress(organizer) if organizer else None \
</del><ins>+ organizer_principal = (yield \
calresource.principalForCalendarUserAddress(organizer)) if organizer else None \
</ins><span class="cx"> organizer_uid = organizer_principal.principalUID() if \
organizer_principal else "" </span><span class="cx">
</span><span class="cx"> # Free busy is per-user
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> if excludeuid:
</span><span class="cx"> # See if we have a UID match
</span><span class="cx"> if (excludeuid == uid):
</span><del>- test_principal = \
calresource.principalForCalendarUserAddress(test_organizer) if test_organizer else \
None </del><ins>+ test_principal = (yield \
calresource.principalForCalendarUserAddress(test_organizer)) if test_organizer else \
None </ins><span class="cx"> test_uid = \
test_principal.principalUID() if test_principal else "" </span><span \
class="cx"> </span><span class="cx"> # Check that \
ORGANIZER's match (security requirement) </span><span class="lines">@@ -688,7 +688,7 \
@@ </span><span class="cx"> # See if we have a UID match
</span><span class="cx"> if (excludeuid == uid):
</span><span class="cx"> test_organizer = calendar.getOrganizer()
</span><del>- test_principal = \
calresource.principalForCalendarUserAddress(test_organizer) if test_organizer else \
None </del><ins>+ test_principal = (yield \
calresource.principalForCalendarUserAddress(test_organizer)) if test_organizer else \
None </ins><span class="cx"> test_uid = \
test_principal.principalUID() if test_principal else "" </span><span \
class="cx"> </span><span class="cx"> # Check that ORGANIZER's \
match (security requirement) </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic