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

Don't require current-user-principal

Browse source 
See #498
This commit is contained in:
Markus Unterwaditzer 2016-09-12 18:58:02 +02:00
parent 1846b392fa
commit b0c498f70a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vdirsyncer/storage/dav.py
View file

@ -164,7 +164,13 @@ class Discover(object):
root = _parse_xml(response.content) root = _parse_xml(response.content)
rv = root.find('.//{DAV:}current-user-principal/{DAV:}href') rv = root.find('.//{DAV:}current-user-principal/{DAV:}href')
if rv is None: if rv is None:
raise InvalidXMLResponse() # This is for servers that don't support current-user-principal
# E.g. Synology NAS
# See https://github.com/pimutils/vdirsyncer/issues/498
dav_logger.debug(
'No current-user-principal returned, re-using URL {}'
.format(response.url))
return response.url
return urlparse.urljoin(response.url, rv.text) return urlparse.urljoin(response.url, rv.text)
def find_home(self, url=None): def find_home(self, url=None):