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

Merge ical and storage modules

Browse source
This commit is contained in:
Guillaume Ayoub 2016-04-10 02:08:07 +02:00
parent 73d39ea572
commit 41e319a8b8
4 changed files with 398 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radicale/xmlutils.py
View file

@ -30,7 +30,7 @@ import xml.etree.ElementTree as ET
from collections import OrderedDict
from urllib.parse import unquote, urlparse
from . import client, config, ical
from . import client, config, storage
NAMESPACES = {
@ -228,7 +228,7 @@ def propfind(path, xml_request, read_collections, write_collections, user=None):
def _propfind_response(path, item, props, user, write=False):
"""Build and return a PROPFIND response."""
is_collection = isinstance(item, ical.Collection)
is_collection = isinstance(item, storage.Collection)
if is_collection:
is_leaf = item.is_leaf(item.path)
with item.props as properties:
@ -329,7 +329,7 @@ def _propfind_response(path, item, props, user, write=False):
elif tag == _tag("CS", "getctag"):
element.text = item.etag
elif tag == _tag("C", "calendar-timezone"):
element.text = ical.serialize(
element.text = storage.serialize(
item.tag, item.headers, item.timezones)
elif tag == _tag("D", "displayname"):
element.text = item.name
@ -530,8 +530,8 @@ def report(path, xml_request, collection):
found_props.append(element)
elif tag in (_tag("C", "calendar-data"),
_tag("CR", "address-data")):
if isinstance(item, ical.Component):
element.text = ical.serialize(
if isinstance(item, storage.Component):
element.text = storage.serialize(
collection_tag, collection_headers,
collection_timezones + [item])
found_props.append(element)