tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #423 from Unrud/patch-17

Browse Source 
Resolve naming conflict
This commit is contained in:
Guillaume Ayoub 2016-06-13 15:08:33 +02:00 committed by GitHub
commit 40406359e5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
radicale/xmlutils.py
View File

@ -549,10 +549,10 @@ def _propfind_response(path, item, props, user, write=False):
if "vtimezone" in event.contents: if "vtimezone" in event.contents:
for timezone_ in event.vtimezone_list: for timezone_ in event.vtimezone_list:
timezones.add(timezone_) timezones.add(timezone_)
collection = vobject.iCalendar() timezone_collection = vobject.iCalendar()
for timezone_ in timezones: for timezone_ in timezones:
collection.add(timezone_) timezone_collection.add(timezone_)
element.text = collection.serialize() element.text = timezone_collection.serialize()
elif tag == _tag("D", "displayname"): elif tag == _tag("D", "displayname"):
element.text = item.get_meta("D:displayname") or item.path element.text = item.get_meta("D:displayname") or item.path
elif tag == _tag("ICAL", "calendar-color"): elif tag == _tag("ICAL", "calendar-color"):