I had a closer look at another of the changes from chrysn, and it seem to be OK to me. I've checked both RFC 4791 and 6352, and verified that the two requirements for *-multiget are equivalent for CalDAV and CardDAV. I thus believe this patch should be applied.
From 886f7bc0ef0cb74f4cae5d757708146c85fc5185 Mon Sep 17 00:00:00 2001 From: chrysn <[email protected]> Date: Tue, 28 Oct 2014 16:08:13 +0100 Subject: [PATCH] handle addressbook-multiget like calendar-multiget the requests are analogous, and without that handling, calypso would report the complete set instead of only the selected entries. this was brought to light by duplicate entries in davdroid, which should check the urls by itself, but things are easier to fix here. --- calypso/xmlutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calypso/xmlutils.py b/calypso/xmlutils.py index 460ee2a..30dfc1a 100644 --- a/calypso/xmlutils.py +++ b/calypso/xmlutils.py @@ -330,7 +330,7 @@ def report(path, xml_request, collection): filter_element = root.find(_tag("C", "filter")) if collection: - if root.tag == _tag("C", "calendar-multiget"): + if root.tag == _tag("C", "calendar-multiget") or root.tag == _tag('A', 'addressbook-multiget'): # Read rfc4791-7.9 for info hreferences = set((href_element.text for href_element in root.findall(_tag("D", "href")))) -- 2.7.0.rc3 Happy hacking Petter Reinholdtsen _______________________________________________ Calypso mailing list [email protected] http://keithp.com/mailman/listinfo/calypso
