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

[source_changes at macosforge.org]

Revision: 4835
          http://trac.macosforge.org/projects/calendarserver/changeset/4835
Author:   wsanchez at apple.com
Date:     2009-12-07 14:36:38 -0800 (Mon, 07 Dec 2009)
Log Message:
-----------
Unroll some 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:26:58 UTC (rev 4834)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2009-12-07 22:36:38 UTC (rev 4835)
@@ -23,8 +23,7 @@
     "CalendarUserProxyDatabase",
 ]
 
-from twisted.internet.defer import returnValue
-from twisted.internet.defer import succeed, inlineCallbacks
+from twisted.internet.defer import succeed, inlineCallbacks, returnValue
 from twisted.web2 import responsecode
 from twisted.web2.http import HTTPError, StatusResponse
 from twisted.web2.dav import davxml
@@ -211,11 +210,12 @@
             
         returnValue(True)
 
-    @inlineCallbacks
     def setGroupMemberSetPrincipals(self, principals):
         # Map the principals to UIDs.
-        uids = [p.principalUID() for p in principals]
-        yield self._index().setGroupMembers(self.uid, uids)
+        return self._index().setGroupMembers(
+            self.uid,
+            [p.principalUID() for p in principals],
+        )
 
     ##
     # HTTP
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091207/5f13d3cb/attachment.html>