[CalendarServer-changes] [13043] CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method /report_common.py
source_changes at macosforge.org
source_changes at macosforge.org
Fri Mar 28 18:34:33 PDT 2014
Revision: 13043
http://trac.calendarserver.org//changeset/13043
Author: sagen at 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140328/a30c39f6/attachment-0001.html>
More information about the calendarserver-changes
mailing list