mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-05 22:27:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale

Browse source 
Conflicts:
	radicale/xmlutils.py
This commit is contained in:
System User 2011-02-17 10:42:02 +01:00
commit bb7f36fc59
6 changed files with 57 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radicale/xmlutils.py
View file

@ -29,7 +29,7 @@ in them for XML requests (all but PUT).
import xml.etree.ElementTree as ET
from radicale import client, config, ical
from radicale import client, config, ical, log
NAMESPACES = {
@ -45,11 +45,13 @@ def _tag(short_name, local):
def _response(code):
"""Return full W3C names from HTTP status codes."""
log.log(10, "Return full W3C names from HTTP status codes.")
return "HTTP/1.1 %i %s" % (code, client.responses[code])
def name_from_path(path):
"""Return Radicale item name from ``path``."""
log.log(10, "Return Radicale item name from ``path``.")
path_parts = path.strip("/").split("/")
return path_parts[-1] if len(path_parts) > 2 else None
@ -61,6 +63,7 @@ def delete(path, calendar):
"""
# Reading request
log.log(10, "Read and answer DELETE requests.")
calendar.remove(name_from_path(path))
# Writing answer
@ -86,8 +89,9 @@ def propfind(path, xml_request, calendar, depth):
"""
# Reading request
log.log(10, "Read and answer PROPFIND requests.")
root = ET.fromstring(xml_request)
prop_element = root.find(_tag("D", "prop"))
prop_list = prop_element.getchildren()
props = [prop.tag for prop in prop_list]
@ -172,6 +176,7 @@ def propfind(path, xml_request, calendar, depth):
def put(path, ical_request, calendar):
"""Read PUT requests."""
log.log(10, "Read PUT requests.")
name = name_from_path(path)
if name in (item.name for item in calendar.items):
# PUT is modifying an existing item
@ -188,6 +193,7 @@ def report(path, xml_request, calendar):
"""
# Reading request
log.log(10, "Read and answer REPORT requests.")
root = ET.fromstring(xml_request)
prop_element = root.find(_tag("D", "prop"))