From 8275d23635e5b97749d78ffa69f4791559fe3bff Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 14 Feb 2015 18:25:15 +0100 Subject: [PATCH] Remove some workarounds for Radicale --- CHANGELOG.rst | 2 ++ docs/supported.rst | 13 +++---------- vdirsyncer/storage/dav.py | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5432cd0..6126600 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,6 +18,8 @@ Version 0.4.3 - Add ``post_hook`` param to ``filesystem``-storage. - Collection creation now also works with SabreDAV-based servers, such as Baikal or ownCloud. +- Removed some workarounds for Radicale. Upgrading to the latest Radicale will + fix the issues. Version 0.4.2 ============= diff --git a/docs/supported.rst b/docs/supported.rst index 6008771..48039f8 100644 --- a/docs/supported.rst +++ b/docs/supported.rst @@ -64,16 +64,9 @@ them is neither supported nor encouraged. - `Versions of Radicale older than 0.9b1 choke on RFC-conform queries for all items of a collection `_. - Vdirsyncer's default value ``["VTODO", "VEVENT"]'`` for - :py:class:`vdirsyncer.storage.CaldavStorage`'s ``item_types`` parameter will - work fine with these versions, and so will all values, except for the empty - one. - - The empty list ``[]`` will get vdirsyncer to send a single HTTP request to - fetch all items, instead of one HTTP request for each possible item type. As - the linked issue describes, old versions of Radicale expect a - non-RFC-compliant format for such queries, one which vdirsyncer doesn't - support. + You have to set ``item_types = ["VTODO", "VEVENT"]`` in + :py:class:`vdirsyncer.storage.CaldavStorage` for vdirsyncer to work with + those versions. .. _Radicale: http://radicale.org/ diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index 9515d4f..13d8f64 100644 --- a/vdirsyncer/storage/dav.py +++ b/vdirsyncer/storage/dav.py @@ -556,7 +556,7 @@ class CaldavStorage(DavStorage): get_multi_data_query = '{urn:ietf:params:xml:ns:caldav}calendar-data' def __init__(self, start_date=None, end_date=None, - item_types=('VTODO', 'VEVENT'), **kwargs): + item_types=(), **kwargs): super(CaldavStorage, self).__init__(**kwargs) if not isinstance(item_types, (list, tuple)): raise ValueError('item_types must be a list.')