[CalendarServer-changes] [4836] CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py

[source_changes at macosforge.org]

Revision: 4836
          http://trac.macosforge.org/projects/calendarserver/changeset/4836
Author:   wsanchez at apple.com
Date:     2009-12-07 15:05:30 -0800 (Mon, 07 Dec 2009)
Log Message:
-----------
Unroll inlineCallbacks

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py

Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2009-12-07 22:36:38 UTC (rev 4835)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2009-12-07 23:05:30 UTC (rev 4836)
@@ -354,11 +354,15 @@
     def expandedGroupMembers(self):
         return self._expandMemberUIDs(infinity=True)
 
-    @inlineCallbacks
     def groupMemberships(self):
         # Get membership UIDs and map to principal resources
-        memberships = yield self._index().getMemberships(self.uid)
-        returnValue([p for p in [self.pcollection.principalForUID(uid) for uid in memberships] if p])
+        d = self._index().getMemberships(self.uid)
+        d.addCallback(lambda memberships: [
+            p for p
+            in [self.pcollection.principalForUID(uid) for uid in memberships]
+            if p
+        ])
+        return d
 
 class CalendarUserProxyDatabase(AbstractSQLDatabase, LoggingMixIn):
     """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091207/f86bc904/attachment-0001.html>