Monotone-Parent: 86ef295932bd121e7b8a29072f0a498b9bc26089

Monotone-Revision: 57d4b2a3ccb82fb9075fec4638adcd3bbb16ae4d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-26T15:15:42
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-04-26 15:15:42 +00:00
parent 90341bbe6b
commit 2387868240
2 changed files with 4 additions and 4 deletions

View File

@ -104,8 +104,8 @@ class WebDAVTest(unittest.TestCase):
## property-search at a time:
# ["{urn:ietf:params:xml:ns:caldav}calendar-home-set",
# "/SOGo/dav/%s/Calendar" % subscriber_username]]
query = webdavlib.WebDAVPrincipalPropertySearch(resource, matches,
["displayname"])
query = webdavlib.WebDAVPrincipalPropertySearch(resource,
["displayname"], matches)
self.client.execute(query)
self.assertEquals(query.response["status"], 207)
response = query.xpath_evaluate('/D:multistatus/D:response')[0]

View File

@ -274,7 +274,7 @@ class WebDAVPUT(WebDAVQuery):
return self.content
class WebDAVPrincipalPropertySearch(WebDAVREPORT):
def __init__(self, url, matches, properties):
def __init__(self, url, properties, matches):
WebDAVQuery.__init__(self, url)
ppsearch_tag = self.ns_mgr.register("principal-property-search",
xmlns_dav)
@ -367,7 +367,7 @@ class CalDAVPOST(WebDAVQuery):
return self.content
class CalDAVCalendarMultiget(WebDAVREPORT):
def __init__(self, url, hrefs, properties):
def __init__(self, url, properties, hrefs):
WebDAVQuery.__init__(self, url)
multiget_tag = self.ns_mgr.register("calendar-multiget", xmlns_caldav)
self.top_node = _WD_XMLTreeElement(multiget_tag)