sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more bugs re #523

Browse source
This commit is contained in:
Markus Unterwaditzer 2017-01-05 18:50:38 +01:00
parent cc8fe7f773
commit 5568e4873e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
vdirsyncer/storage/dav.py
View file

@ -86,7 +86,7 @@ def _parse_xml(content):
def _merge_xml(items): def _merge_xml(items):
if not items: if not items:
return [] return None
rv = items[0] rv = items[0]
for item in items[1:]: for item in items[1:]:
rv.extend(item.getiterator()) rv.extend(item.getiterator())
@ -210,7 +210,12 @@ class Discover(object):
done = set() done = set()
for response in root.findall('{DAV:}response'): for response in root.findall('{DAV:}response'):
props = _merge_xml(response.findall('{DAV:}propstat/{DAV:}prop')) props = _merge_xml(response.findall('{DAV:}propstat/{DAV:}prop'))
if not props:
logger.debug('Skipping, missing <prop>: %s', response)
continue
if props.find('{DAV:}resourcetype/' + self._resourcetype) is None: if props.find('{DAV:}resourcetype/' + self._resourcetype) is None:
logger.debug('Skipping, not of resource type %s: %s',
self._resourcetype, response)
continue continue
href = response.find('{DAV:}href') href = response.find('{DAV:}href')