[CalendarServer-changes] [2796] CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/ method/delete.py

[source_changes at macosforge.org]

Revision: 2796
          http://trac.macosforge.org/projects/calendarserver/changeset/2796
Author:   cdaboo at apple.com
Date:     2008-08-11 13:29:44 -0700 (Mon, 11 Aug 2008)
Log Message:
-----------
Don't trigger implicit deletes on inbox.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/delete.py

Modified: CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/delete.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/delete.py	2008-08-11 19:32:42 UTC (rev 2795)
+++ CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/delete.py	2008-08-11 20:29:44 UTC (rev 2796)
@@ -24,7 +24,8 @@
 from twisted.web2 import responsecode
 from twisted.web2.dav.util import parentForURL
 
-from twistedcaldav.resource import isPseudoCalendarCollectionResource
+from twistedcaldav.resource import isPseudoCalendarCollectionResource,\
+    isCalendarCollectionResource
 from twistedcaldav.scheduling.implicit import ImplicitScheduler
 
 @inlineCallbacks
@@ -44,10 +45,10 @@
     is_calendar_collection = False
     is_calendar_resource = False
     if self.exists():
-        if isPseudoCalendarCollectionResource(parent):
+        if isCalendarCollectionResource(parent):
             is_calendar_resource = True
             calendar = self.iCalendar()
-        elif isPseudoCalendarCollectionResource(self):
+        elif isCalendarCollectionResource(self):
             is_calendar_collection = True
 
     response = (yield super(CalDAVFile, self).http_DELETE(request))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080811/35d1ed8f/attachment.html