[CalendarServer-changes] [6439] CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/ dropbox.py

[source_changes at macosforge.org]

Revision: 6439
          http://trac.macosforge.org/projects/calendarserver/changeset/6439
Author:   glyph at apple.com
Date:     2010-10-18 10:20:41 -0700 (Mon, 18 Oct 2010)
Log Message:
-----------
pass back more writeNewACEs results

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/dropbox.py

Modified: CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/dropbox.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/dropbox.py	2010-10-18 17:19:58 UTC (rev 6438)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/dropbox.py	2010-10-18 17:20:41 UTC (rev 6439)
@@ -30,7 +30,7 @@
 from twext.web2.dav.resource import DAVResource, TwistedACLInheritable
 from twext.web2.dav.util import joinURL
 
-from twisted.internet.defer import succeed, inlineCallbacks, returnValue
+from twisted.internet.defer import inlineCallbacks, returnValue
 
 from twistedcaldav.config import config
 from twistedcaldav.customxml import calendarserver_namespace
@@ -42,7 +42,7 @@
     Drop box collection resource.
     """
     def resourceType(self):
-        return davxml.ResourceType.dropboxhome
+        return davxml.ResourceType.dropboxhome #@UndefinedVariable
 
     def isCollection(self):
         return True
@@ -83,12 +83,15 @@
     """
     Drop box resource.
     """
+
     def resourceType(self):
-        return davxml.ResourceType.dropbox
+        return davxml.ResourceType.dropbox #@UndefinedVariable
 
+
     def isCollection(self):
         return True
 
+
     def writeNewACEs(self, newaces):
         """
         Write a new ACL to the resource's property store. We override this for calendar collections
@@ -108,10 +111,11 @@
                 edited_aces.append(davxml.ACE(*children))
             else:
                 edited_aces.append(ace)
-        
+
         # Do inherited with possibly modified set of aces
-        super(DropBoxCollectionResource, self).writeNewACEs(edited_aces)
+        return super(DropBoxCollectionResource, self).writeNewACEs(edited_aces)
 
+
     def http_PUT(self, request):
         return ErrorResponse(
             responsecode.FORBIDDEN,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101018/18d5cb7e/attachment-0001.html>