From 73390c922e68330a209af6b6ccf03929a2107d45 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Wed, 29 Jun 2011 11:04:09 +0200 Subject: [PATCH] Sort the methods in the server class --- radicale/__init__.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/radicale/__init__.py b/radicale/__init__.py index 42d0936..391b512 100644 --- a/radicale/__init__.py +++ b/radicale/__init__.py @@ -239,6 +239,21 @@ class Application(object): # All these functions must have the same parameters, some are useless # pylint: disable=W0612,W0613,R0201 + def delete(self, environ, calendars, content): + """Manage DELETE request.""" + calendar = calendars[0] + item = calendar.get_item( + xmlutils.name_from_path(environ["PATH_INFO"], calendar)) + if item and environ.get("HTTP_IF_MATCH", item.etag) == item.etag: + # No ETag precondition or precondition verified, delete item + answer = xmlutils.delete(environ["PATH_INFO"], calendar) + status = client.NO_CONTENT + else: + # No item or ETag precondition not verified, do not delete item + answer = None + status = client.PRECONDITION_FAILED + return status, {}, answer + def get(self, environ, calendars, content): """Manage GET request.""" calendar = calendars[0] @@ -271,21 +286,6 @@ class Application(object): status, headers, answer = self.get(environ, calendars, content) return status, headers, None - def delete(self, environ, calendars, content): - """Manage DELETE request.""" - calendar = calendars[0] - item = calendar.get_item( - xmlutils.name_from_path(environ["PATH_INFO"], calendar)) - if item and environ.get("HTTP_IF_MATCH", item.etag) == item.etag: - # No ETag precondition or precondition verified, delete item - answer = xmlutils.delete(environ["PATH_INFO"], calendar) - status = client.NO_CONTENT - else: - # No item or ETag precondition not verified, do not delete item - answer = None - status = client.PRECONDITION_FAILED - return status, {}, answer - def mkcalendar(self, environ, calendars, content): """Manage MKCALENDAR request.""" calendar = calendars[0]