[CalendarServer-changes] [4834] CalendarServer/trunk/twistedcaldav/directory/calendar.py

[source_changes at macosforge.org]

Revision: 4834
          http://trac.macosforge.org/projects/calendarserver/changeset/4834
Author:   wsanchez at apple.com
Date:     2009-12-07 14:26:58 -0800 (Mon, 07 Dec 2009)
Log Message:
-----------
Unroll inlineCallbacks

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

Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendar.py	2009-12-07 22:26:30 UTC (rev 4833)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py	2009-12-07 22:26:58 UTC (rev 4834)
@@ -27,7 +27,7 @@
     "DirectoryCalendarHomeResource",
 ]
 
-from twisted.internet.defer import succeed, inlineCallbacks, returnValue
+from twisted.internet.defer import succeed
 from twisted.web2 import responsecode
 from twisted.web2.dav import davxml
 from twisted.web2.http import HTTPError
@@ -411,18 +411,20 @@
 
         return davxml.ACL(*aces)
 
-    @inlineCallbacks
     def accessControlList(self, request, inheritance=True, expanding=False, inherited_aces=None):
+        def gotACL(wikiACL):
+            if wikiACL is not None:
+                # ACL depends on wiki server...
+                log.debug("Wiki ACL: %s" % (wikiACL.toxml(),))
+                return succeed(wikiACL)
+            else:
+                # ...otherwise permissions are fixed, and are not subject to
+                # inheritance rules, etc.
+                return succeed(self.defaultAccessControlList())
 
-        wikiACL = (yield getWikiACL(self, request))
-        if wikiACL is not None:
-            # ACL depends on wiki server...
-            log.debug("Wiki ACL: %s" % (wikiACL.toxml(),))
-            returnValue(wikiACL)
-        else:
-            # ...otherwise permissions are fixed, and are not subject to
-            # inheritance rules, etc.
-            returnValue(self.defaultAccessControlList())
+        d = getWikiACL(self, request)
+        d.addCallback(gotACL)
+        return d
 
     def principalCollections(self):
         return self.parent.principalCollections()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091207/bd925131/attachment.html>