tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always return pretty XML

Browse Source
This commit is contained in:
Guillaume Ayoub
2011-05-11 11:20:39 +02:00
parent 0328b2244b
commit 8f2335093d
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
radicale/xmlutils.py
View File

@@ -42,7 +42,7 @@ for short, url in NAMESPACES.items():
ET._namespace_map[url] = short ET._namespace_map[url] = short
def _et_indent(element, level=0): def _pretty_xml(element, level=0):
"""Indent an ElementTree ``element`` and its children.""" """Indent an ElementTree ``element`` and its children."""
i = "\n" + level * " " i = "\n" + level * " "
if len(element): if len(element):
@@ -51,7 +51,7 @@ def _et_indent(element, level=0):
if not element.tail or not element.tail.strip(): if not element.tail or not element.tail.strip():
element.tail = i element.tail = i
for sub_element in element: for sub_element in element:
_et_indent(sub_element, level + 1) _pretty_xml(sub_element, level + 1)
# ``sub_element`` is always defined as len(element) > 0 # ``sub_element`` is always defined as len(element) > 0
# pylint: disable=W0631 # pylint: disable=W0631
if not sub_element.tail or not sub_element.tail.strip(): if not sub_element.tail or not sub_element.tail.strip():
@@ -60,6 +60,8 @@ def _et_indent(element, level=0):
else: else:
if level and (not element.tail or not element.tail.strip()): if level and (not element.tail or not element.tail.strip()):
element.tail = i element.tail = i
if not level:
return ET.tostring(element, config.get("encoding", "request"))
def _tag(short_name, local): def _tag(short_name, local):
@@ -99,10 +101,7 @@ def delete(path, calendar):
status.text = _response(200) status.text = _response(200)
response.append(status) response.append(status)
if config.getboolean("logging", "debug"): return _pretty_xml(multistatus)
_et_indent(multistatus)
return ET.tostring(multistatus, config.get("encoding", "request"))
def propfind(path, xml_request, calendar, depth): def propfind(path, xml_request, calendar, depth):
@@ -203,10 +202,7 @@ def propfind(path, xml_request, calendar, depth):
status.text = _response(200) status.text = _response(200)
propstat.append(status) propstat.append(status)
if config.getboolean("logging", "debug"): return _pretty_xml(multistatus)
_et_indent(multistatus)
return ET.tostring(multistatus, config.get("encoding", "request"))
def proppatch(path, xml_request, calendar): def proppatch(path, xml_request, calendar):
@@ -249,10 +245,7 @@ def proppatch(path, xml_request, calendar):
status.text = _response(200) status.text = _response(200)
propstat.append(status) propstat.append(status)
if config.getboolean("logging", "debug"): return _pretty_xml(multistatus)
_et_indent(multistatus)
return ET.tostring(multistatus, config.get("encoding", "request"))
def put(path, ical_request, calendar): def put(path, ical_request, calendar):
@@ -332,7 +325,4 @@ def report(path, xml_request, calendar):
status.text = _response(200) status.text = _response(200)
propstat.append(status) propstat.append(status)
if config.getboolean("logging", "debug"): return _pretty_xml(multistatus)
_et_indent(multistatus)
return ET.tostring(multistatus, config.get("encoding", "request"))