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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	radicale/__init__.py
	radicale/acl/courier.py
This commit is contained in:
Matthias Jordan 2012-08-04 11:27:51 +02:00
commit 55a13d4c39
8 changed files with 83 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
radicale/xmlutils.py
View file

@ -270,8 +270,8 @@ def _propfind_response(path, item, props, user):
element.append(privilege)
elif tag == _tag("D", "supported-report-set"):
for report_name in (
"principal-property-search", "sync-collection"
"expand-property", "principal-search-property-set"):
"principal-property-search", "sync-collection"
"expand-property", "principal-search-property-set"):
supported = ET.Element(_tag("D", "supported-report"))
report_tag = ET.Element(_tag("D", "report"))
report_tag.text = report_name
@ -422,9 +422,8 @@ def report(path, xml_request, collection):
props = [prop.tag for prop in prop_element]
if collection:
if root.tag in (
_tag("C", "calendar-multiget"),
_tag("CR", "addressbook-multiget")):
if root.tag in (_tag("C", "calendar-multiget"),
_tag("CR", "addressbook-multiget")):
# Read rfc4791-7.9 for info
hreferences = set(
href_element.text for href_element
@ -472,8 +471,8 @@ def report(path, xml_request, collection):
element = ET.Element(tag)
if tag == _tag("D", "getetag"):
element.text = item.etag
elif tag in (
_tag("C", "calendar-data"), _tag("CR", "address-data")):
elif tag in (_tag("C", "calendar-data"),
_tag("CR", "address-data")):
if isinstance(item, ical.Component):
element.text = ical.serialize(
collection_tag, collection_headers,