diff --git a/radicale/__init__.py b/radicale/__init__.py index 2fc3f804..64b58335 100644 --- a/radicale/__init__.py +++ b/radicale/__init__.py @@ -154,7 +154,8 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler): def do_GET(self): """Manage GET request.""" self.do_HEAD() - self.wfile.write(self._answer) + if self._answer: + self.wfile.write(self._answer) @check_rights def do_HEAD(self): @@ -170,6 +171,7 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler): headers=self._calendar.headers, items=items) etag = item.etag else: + self._answer = None self.send_response(client.GONE) return else: diff --git a/radicale/xmlutils.py b/radicale/xmlutils.py index 7ff759b0..ddf0a7f1 100644 --- a/radicale/xmlutils.py +++ b/radicale/xmlutils.py @@ -52,7 +52,8 @@ def _response(code): def name_from_path(path): """Return Radicale item name from ``path``.""" - return path.split("/")[-1] + path_parts = path.strip("/").split("/") + return path_parts[-1] if len(path_parts) > 2 else None def delete(path, calendar):