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

Always use string header values

Browse source 
Preparing for https://github.com/kennethreitz/requests/issues/3386
This commit is contained in:
Markus Unterwaditzer 2016-07-25 03:07:54 +02:00
parent 140af81ead
commit d8a1fb4a62
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vdirsyncer/storage/dav.py
View file

@ -145,7 +145,7 @@ class Discover(object):
return self.find_principal(self.find_dav()) return self.find_principal(self.find_dav())
headers = self.session.get_default_headers() headers = self.session.get_default_headers()
headers['Depth'] = 0 headers['Depth'] = '0'
body = """ body = """
<d:propfind xmlns:d="DAV:"> <d:propfind xmlns:d="DAV:">
<d:prop> <d:prop>
@ -165,7 +165,7 @@ class Discover(object):
if url is None: if url is None:
url = self.find_principal() url = self.find_principal()
headers = self.session.get_default_headers() headers = self.session.get_default_headers()
headers['Depth'] = 0 headers['Depth'] = '0'
response = self.session.request('PROPFIND', url, response = self.session.request('PROPFIND', url,
headers=headers, headers=headers,
data=self._homeset_xml) data=self._homeset_xml)
@ -181,7 +181,7 @@ class Discover(object):
if url is None: if url is None:
url = self.find_home() url = self.find_home()
headers = self.session.get_default_headers() headers = self.session.get_default_headers()
headers['Depth'] = 1 headers['Depth'] = '1'
r = self.session.request('PROPFIND', url, headers=headers, r = self.session.request('PROPFIND', url, headers=headers,
data=self._collection_xml) data=self._collection_xml)
root = _parse_xml(r.content) root = _parse_xml(r.content)
@ -560,7 +560,7 @@ class DavStorage(Storage):
def list(self): def list(self):
headers = self.session.get_default_headers() headers = self.session.get_default_headers()
headers['Depth'] = 1 headers['Depth'] = '1'
data = '''<?xml version="1.0" encoding="utf-8" ?> data = '''<?xml version="1.0" encoding="utf-8" ?>
<D:propfind xmlns:D="DAV:"> <D:propfind xmlns:D="DAV:">
@ -600,7 +600,7 @@ class DavStorage(Storage):
) )
headers = self.session.get_default_headers() headers = self.session.get_default_headers()
headers['Depth'] = 0 headers['Depth'] = '0'
response = self.session.request( response = self.session.request(
'PROPFIND', '', 'PROPFIND', '',
@ -787,7 +787,7 @@ class CaldavStorage(DavStorage):
# The default in CalDAV's calendar-queries is 0, but the examples use # The default in CalDAV's calendar-queries is 0, but the examples use
# an explicit value of 1 for querying items. it is extremely unclear in # an explicit value of 1 for querying items. it is extremely unclear in
# the spec which values from WebDAV are actually allowed. # the spec which values from WebDAV are actually allowed.
headers['Depth'] = 1 headers['Depth'] = '1'
for caldavfilter in caldavfilters: for caldavfilter in caldavfilters:
xml = data.format(caldavfilter=caldavfilter) xml = data.format(caldavfilter=caldavfilter)