diff --git a/tests/storage/dav/test_main.py b/tests/storage/dav/test_main.py
index ef39c46..8a8a0c8 100644
--- a/tests/storage/dav/test_main.py
+++ b/tests/storage/dav/test_main.py
@@ -7,23 +7,23 @@ from vdirsyncer.storage.dav import _parse_xml
def test_xml_utilities():
x = _parse_xml(b'''
-
-
-
- HTTP/1.1 404 Not Found
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ HTTP/1.1 404 Not Found
+
+
+
+
+
+
+
+
+
+
+
+
+
''')
response = x.find('{DAV:}response')
diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
index 2c02ae3..4651dab 100644
--- a/vdirsyncer/storage/dav.py
+++ b/vdirsyncer/storage/dav.py
@@ -150,11 +150,11 @@ class Discover:
_homeset_tag = None
_well_known_uri = None
_collection_xml = b"""
-
-
-
-
-
+
+
+
+
+
"""
def __init__(self, session, kwargs):
@@ -180,11 +180,11 @@ class Discover:
headers = self.session.get_default_headers()
headers['Depth'] = '0'
body = b"""
-
-
-
-
-
+
+
+
+
+
"""
response = self.session.request('PROPFIND', url, headers=headers,
@@ -300,16 +300,16 @@ class Discover:
def _create_collection_impl(self, url):
data = '''
-
-
-
-
-
+
+
+
+
+
{}
-
-
-
-
+
+
+
+
'''.format(
etree.tostring(etree.Element(self._resourcetype),
encoding='unicode')
@@ -328,11 +328,11 @@ class CalDiscover(Discover):
_namespace = 'urn:ietf:params:xml:ns:caldav'
_resourcetype = '{%s}calendar' % _namespace
_homeset_xml = b"""
-
-
+
+
-
-
+
+
"""
_homeset_tag = '{%s}calendar-home-set' % _namespace
_well_known_uri = '/.well-known/caldav'
@@ -342,11 +342,11 @@ class CardDiscover(Discover):
_namespace = 'urn:ietf:params:xml:ns:carddav'
_resourcetype = '{%s}addressbook' % _namespace
_homeset_xml = b"""
-
-
+
+
-
-
+
+
"""
_homeset_tag = '{%s}addressbook-home-set' % _namespace
_well_known_uri = '/.well-known/carddav'
@@ -463,7 +463,7 @@ class DAVStorage(Storage):
for href in hrefs:
if href != self._normalize_href(href):
raise exceptions.NotFoundError(href)
- href_xml.append(f'{href}')
+ href_xml.append(f'{href}')
if not href_xml:
return ()
@@ -620,13 +620,13 @@ class DAVStorage(Storage):
headers['Depth'] = '1'
data = b'''
-
-
-
-
-
-
-
+
+
+
+
+
+
+
'''
# We use a PROPFIND request instead of addressbook-query due to issues
@@ -647,11 +647,11 @@ class DAVStorage(Storage):
xpath = f'{{{namespace}}}{tagname}'
data = '''
-
-
+
+
{}
-
-
+
+
'''.format(
etree.tostring(etree.Element(xpath), encoding='unicode')
).encode('utf-8')
@@ -683,13 +683,13 @@ class DAVStorage(Storage):
element.text = normalize_meta_value(value)
data = '''
-
-
-
+
+
+
{}
-
-
-
+
+
+
'''.format(etree.tostring(element, encoding='unicode')).encode('utf-8')
self.session.request(
@@ -714,12 +714,12 @@ class CalDAVStorage(DAVStorage):
end_date = None
get_multi_template = '''
-
-
-
+
+
-
+
{hrefs}
'''
@@ -796,12 +796,12 @@ class CalDAVStorage(DAVStorage):
yield from DAVStorage.list(self)
data = '''
-
-
-
-
-
+
+
+
+
{caldavfilter}
@@ -833,12 +833,12 @@ class CardDAVStorage(DAVStorage):
discovery_class = CardDiscover
get_multi_template = '''
-
-
-
+
+
-
+
{hrefs}
'''