[CalendarServer-changes] [13044] CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/ datastore

[source_changes at macosforge.org]

Revision: 13044
          http://trac.calendarserver.org//changeset/13044
Author:   sagen at apple.com
Date:     2014-03-28 18:35:00 -0700 (Fri, 28 Mar 2014)
Log Message:
-----------
yield

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/freebusy.py
    CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/ischedule/resource.py
    CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/freebusy.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/freebusy.py	2014-03-29 01:34:33 UTC (rev 13043)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/freebusy.py	2014-03-29 01:35:00 UTC (rev 13044)
@@ -397,7 +397,7 @@
                 # See if we have a UID match
                 if (excludeuid == uid):
                     test_organizer = calendar.getOrganizer()
-                    test_record = calresource.principalForCalendarUserAddress(test_organizer) if test_organizer else None
+                    test_record = (yield calresource.principalForCalendarUserAddress(test_organizer)) if test_organizer else None
                     test_uid = test_record.principalUID() if test_record else ""
 
                     # Check that ORGANIZER's match (security requirement)

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/ischedule/resource.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/ischedule/resource.py	2014-03-29 01:34:33 UTC (rev 13043)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/scheduling/ischedule/resource.py	2014-03-29 01:35:00 UTC (rev 13044)
@@ -99,12 +99,13 @@
         return False
 
 
+    @inlineCallbacks
     def principalForCalendarUserAddress(self, address):
         for principalCollection in self.principalCollections():
-            principal = principalCollection.principalForCalendarUserAddress(address)
+            principal = yield principalCollection.principalForCalendarUserAddress(address)
             if principal is not None:
-                return principal
-        return None
+                returnValue(principal)
+        returnValue(None)
 
 
     def render(self, request):

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py	2014-03-29 01:34:33 UTC (rev 13043)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py	2014-03-29 01:35:00 UTC (rev 13044)
@@ -2012,7 +2012,7 @@
                 if hasattr(self._txn, "_authz_uid"):
                     authz = yield self.directoryService().recordWithUID(self._txn._authz_uid.decode("utf-8"))
                     prop = Property("X-CALENDARSERVER-MODIFIED-BY", authz.canonicalCalendarUserAddress())
-                    prop.setParameter("CN", authz.displayName())
+                    prop.setParameter("CN", authz.displayName)
                     for candidate in authz.calendarUserAddresses():
                         if candidate.startswith("mailto:"):
                             prop.setParameter("EMAIL", candidate[7:])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140328/5414703b/attachment.html>