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

decode_href => decode_url

Browse source 
Those functions can be applied to any URL
This commit is contained in:
Markus Unterwaditzer 2015-06-11 15:30:50 +02:00
parent c4b4a4e8ad
commit a07c9bea44
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
vdirsyncer/storage/dav.py
View file

@ -29,11 +29,11 @@ def _normalize_href(base, href):
return x return x
def _encode_href(x): def _encode_url(x):
return utils.compat.urlquote(x, '/@') return utils.compat.urlquote(x, '/@')
def _decode_href(x): def _decode_url(x):
return utils.compat.urlunquote(x) return utils.compat.urlunquote(x)
@ -382,7 +382,7 @@ class DavStorage(Storage):
for href in hrefs: for href in hrefs:
if href != self._normalize_href(href): if href != self._normalize_href(href):
raise exceptions.NotFoundError(href) raise exceptions.NotFoundError(href)
href_xml.append('<D:href>{}</D:href>'.format(_encode_href(href))) href_xml.append('<D:href>{}</D:href>'.format(_encode_url(href)))
if not href_xml: if not href_xml:
return () return ()
@ -435,12 +435,12 @@ class DavStorage(Storage):
response = self.session.request( response = self.session.request(
'PUT', 'PUT',
_encode_href(href), _encode_url(href),
data=item.raw.encode('utf-8'), data=item.raw.encode('utf-8'),
headers=headers headers=headers
) )
etag = response.headers.get('etag', None) etag = response.headers.get('etag', None)
href = self._normalize_href(_decode_href(response.url)) href = self._normalize_href(_decode_url(response.url))
if not etag: if not etag:
dav_logger.warning('Race condition detected with server {}, ' dav_logger.warning('Race condition detected with server {}, '
'consider using an alternative.' 'consider using an alternative.'
@ -468,7 +468,7 @@ class DavStorage(Storage):
self.session.request( self.session.request(
'DELETE', 'DELETE',
_encode_href(href), _encode_url(href),
headers=headers headers=headers
) )
@ -482,7 +482,7 @@ class DavStorage(Storage):
href = self._normalize_href(href.text) href = self._normalize_href(href.text)
for i in range(decoding_rounds): for i in range(decoding_rounds):
href = _decode_href(href) href = _decode_url(href)
if href in hrefs: if href in hrefs:
# Servers that send duplicate hrefs: # Servers that send duplicate hrefs: