Skip to content

Commit 7fcbf18

Browse files
edel_gerardotobixen
authored andcommitted
Revert #472 and re-address #471
1 parent 04b164f commit 7fcbf18

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

caldav/davclient.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@ def _parse_response(self, response) -> Tuple[str, List[_Element], Optional[Any]]
220220
self.validate_status(status)
221221
elif elem.tag == dav.Href.tag:
222222
assert not href
223+
# Fix for https://github.com/python-caldav/caldav/issues/471
224+
# Confluence server quotes the user email twice. We unquote it manually.
225+
if '%2540' in elem.text:
226+
elem.text = elem.text.replace('%2540', '%40')
223227
href = unquote(elem.text)
224228
elif elem.tag == dav.PropStat.tag:
225229
propstats.append(elem)

caldav/objects.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ def get_properties(
312312
exchange_path = path[:-1]
313313
else:
314314
exchange_path = path + "/"
315-
properties = {unquote(k): v for k, v in properties.items()}
316315

317316
if path in properties:
318317
rc = properties[path]

0 commit comments

Comments
 (0)