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

Rename _simplify_href to _normalize_href

Browse source 
Add one assert statement, fix docstring
This commit is contained in:
Markus Unterwaditzer 2014-03-05 20:04:03 +01:00
parent a9c6082e4f
commit 9c265a8bc1
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
vdirsyncer/storage/dav/base.py
View file

@ -72,9 +72,9 @@ class DavStorage(Storage):
if self.dav_header not in response.headers.get('DAV', ''): if self.dav_header not in response.headers.get('DAV', ''):
raise exceptions.StorageError('URL is not a collection') raise exceptions.StorageError('URL is not a collection')
def _simplify_href(self, href): def _normalize_href(self, href):
'''Used to strip hrefs off the collection's URL, to leave only the '''Normalize the href to be a path only relative to hostname and
filename.''' schema.'''
href = urlparse.urlparse(href).path href = urlparse.urlparse(href).path
if href.startswith('/'): if href.startswith('/'):
return href return href
@ -82,7 +82,7 @@ class DavStorage(Storage):
return self.parsed_url.path + href return self.parsed_url.path + href
def _get_href(self, uid): def _get_href(self, uid):
return self._simplify_href(super(DavStorage, self)._get_href(uid)) return self._normalize_href(super(DavStorage, self)._get_href(uid))
def _default_headers(self): def _default_headers(self):
return { return {
@ -92,6 +92,7 @@ class DavStorage(Storage):
def _request(self, method, path, data=None, headers=None): def _request(self, method, path, data=None, headers=None):
path = path or self.parsed_url.path path = path or self.parsed_url.path
assert path.startswith(self.parsed_url.path)
if self._session is None: if self._session is None:
self._session = requests.session() self._session = requests.session()
url = self.parsed_url.scheme + '://' + self.parsed_url.netloc + path url = self.parsed_url.scheme + '://' + self.parsed_url.netloc + path
@ -112,7 +113,7 @@ class DavStorage(Storage):
def get_multi(self, hrefs): def get_multi(self, hrefs):
if not hrefs: if not hrefs:
return () return ()
hrefs = [self._simplify_href(href) for href in hrefs] hrefs = [self._normalize_href(href) for href in hrefs]
href_xml = [] href_xml = []
for href in hrefs: for href in hrefs:
@ -129,7 +130,7 @@ class DavStorage(Storage):
rv = [] rv = []
hrefs_left = set(hrefs) hrefs_left = set(hrefs)
for element in root.iter('{DAV:}response'): for element in root.iter('{DAV:}response'):
href = self._simplify_href( href = self._normalize_href(
element.find('{DAV:}href').text.decode(response.encoding)) element.find('{DAV:}href').text.decode(response.encoding))
obj = element \ obj = element \
.find('{DAV:}propstat') \ .find('{DAV:}propstat') \
@ -158,7 +159,7 @@ class DavStorage(Storage):
return True return True
def update(self, href, obj, etag): def update(self, href, obj, etag):
href = self._simplify_href(href) href = self._normalize_href(href)
headers = self._default_headers() headers = self._default_headers()
headers.update({ headers.update({
'Content-Type': self.item_mimetype, 'Content-Type': self.item_mimetype,
@ -200,7 +201,7 @@ class DavStorage(Storage):
return href, etag return href, etag
def delete(self, href, etag): def delete(self, href, etag):
href = self._simplify_href(href) href = self._normalize_href(href)
headers = self._default_headers() headers = self._default_headers()
headers.update({ headers.update({
'If-Match': etag 'If-Match': etag
@ -225,5 +226,5 @@ class DavStorage(Storage):
for element in root.iter('{DAV:}response'): for element in root.iter('{DAV:}response'):
etag = element.find('{DAV:}propstat').find( etag = element.find('{DAV:}propstat').find(
'{DAV:}prop').find('{DAV:}getetag').text '{DAV:}prop').find('{DAV:}getetag').text
href = self._simplify_href(element.find('{DAV:}href').text) href = self._normalize_href(element.find('{DAV:}href').text)
yield href, etag yield href, etag