[CalendarServer-changes] [321] CalendarServer/branches/users/wsanchez/acl-2/twistedcaldav/method/ delete.py

[source_changes at macosforge.org]

Revision: 321
          http://trac.macosforge.org/projects/calendarserver/changeset/321
Author:   cdaboo at apple.com
Date:     2006-10-27 12:43:33 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
Merge r317 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/acl-2/twistedcaldav/method/delete.py

Modified: CalendarServer/branches/users/wsanchez/acl-2/twistedcaldav/method/delete.py
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/twistedcaldav/method/delete.py	2006-10-27 19:42:44 UTC (rev 320)
+++ CalendarServer/branches/users/wsanchez/acl-2/twistedcaldav/method/delete.py	2006-10-27 19:43:33 UTC (rev 321)
@@ -29,22 +29,28 @@
 from twistedcaldav.resource import isPseudoCalendarCollectionResource
 
 def http_DELETE(self, request):
+    #
     # Override base DELETE request handling to ensure that the calendar
     # index file has the entry for the deleted calendar component removed.
-
-    # Do inherited default behaviour
-    d = maybeDeferred(super(CalDAVFile, self).http_DELETE, request)
-    
+    #
     def deleteFromIndex(response):
         response = IResponse(response)
 
         if response.code == responsecode.NO_CONTENT:
+            def deleteFromParent(parent):
+                if isPseudoCalendarCollectionResource(parent):
+                    index = parent.index()
+                    index.deleteResource(self.fp.basename())
+
+                return response
+            
             # Remove index entry if we are a child of a calendar collection
-            parent = self.locateParent(request, request.uri)
-            if isPseudoCalendarCollectionResource(parent):
-                index = parent.index()
-                index.deleteResource(self.fp.basename())
+            d = self.locateParent(request, request.uri)
+            d.addCallback(deleteFromParent)
+            return d
 
         return response
-        
-    return d.addCallback(deleteFromIndex)
+
+    d = maybeDeferred(super(CalDAVFile, self).http_DELETE, request)
+    d.addCallback(deleteFromIndex)
+    return d

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061027/4fe74df9/attachment.html