[CalendarServer-changes] [5116] CalendarServer/trunk/twistedcaldav/method/delete_common.py

source_changes at macosforge.org source_changes at macosforge.org
Sun Feb 14 20:32:41 PST 2010


Revision: 5116
          http://trac.macosforge.org/projects/calendarserver/changeset/5116
Author:   cdaboo at apple.com
Date:     2010-02-14 20:32:41 -0800 (Sun, 14 Feb 2010)
Log Message:
-----------
Contacts merge clean-up.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/method/delete_common.py

Modified: CalendarServer/trunk/twistedcaldav/method/delete_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/delete_common.py	2010-02-15 04:29:23 UTC (rev 5115)
+++ CalendarServer/trunk/twistedcaldav/method/delete_common.py	2010-02-15 04:32:41 UTC (rev 5116)
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
-from twistedcaldav.method.report_common import applyToAddressBookCollections
-from twistedcaldav.method.report_common import applyToCalendarCollections
 
 
 """
@@ -36,7 +34,7 @@
 from twistedcaldav.caldavxml import caldav_namespace, ScheduleTag
 from twistedcaldav.config import config
 from twistedcaldav.memcachelock import MemcacheLock, MemcacheLockTimeoutError
-from twistedcaldav.method.report_common import applyToCalendarCollections
+from twistedcaldav.method.report_common import applyToAddressBookCollections, applyToCalendarCollections
 from twistedcaldav.resource import isCalendarCollectionResource,\
     isPseudoCalendarCollectionResource, isAddressBookCollectionResource
 from twistedcaldav.scheduling.implicit import ImplicitScheduler
@@ -270,29 +268,7 @@
         response = errors.response()
 
         returnValue(response)
-        
-    @inlineCallbacks
-    def run(self):
 
-        if isCalendarCollectionResource(self.parent):
-            response = (yield self.deleteCalendarResource(self.resource, self.resource_uri, self.parent))
-            
-        elif isCalendarCollectionResource(self.resource):
-            response = (yield self.deleteCalendar(self.resource, self.resource_uri, self.parent))
-        elif isAddressBookCollectionResource(self.parent):
-            response = (yield self.deleteAddressBookResource(self.resource, self.resource_uri, self.parent))
-
-        elif isAddressBookCollectionResource(self.resource):
-            response = (yield self.deleteAddressBook(self.resource, self.resource_uri, self.parent))
-
-        elif self.resource.isCollection():
-            response = (yield self.deleteCollection())
-
-        else:
-            response = (yield self.deleteResource(self.resource, self.resource_uri, self.parent))
-
-        returnValue(response)
-
     @inlineCallbacks
     def deleteAddressBookResource(self, delresource, deluri, parent):
         """
@@ -422,4 +398,25 @@
         response = errors.response()
 
         returnValue(response)
-        
+
+    @inlineCallbacks
+    def run(self):
+
+        if isCalendarCollectionResource(self.parent):
+            response = (yield self.deleteCalendarResource(self.resource, self.resource_uri, self.parent))
+            
+        elif isCalendarCollectionResource(self.resource):
+            response = (yield self.deleteCalendar(self.resource, self.resource_uri, self.parent))
+        elif isAddressBookCollectionResource(self.parent):
+            response = (yield self.deleteAddressBookResource(self.resource, self.resource_uri, self.parent))
+
+        elif isAddressBookCollectionResource(self.resource):
+            response = (yield self.deleteAddressBook(self.resource, self.resource_uri, self.parent))
+
+        elif self.resource.isCollection():
+            response = (yield self.deleteCollection())
+
+        else:
+            response = (yield self.deleteResource(self.resource, self.resource_uri, self.parent))
+
+        returnValue(response)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100214/ade19806/attachment-0001.html>


More information about the calendarserver-changes mailing list