Fix a unicode/string bug in plain support
git-svn-id: http://svn.32rwr.info/radicale/trunk@6 74e4794c-479d-4a33-9dda-c6c359d70f12
This commit is contained in:
parent
e87d37703d
commit
3593799f97
@ -57,7 +57,7 @@ def append(cal, vcalendar):
|
|||||||
"""
|
"""
|
||||||
Append vcalendar to cal
|
Append vcalendar to cal
|
||||||
"""
|
"""
|
||||||
oldCalendar = read(cal)
|
oldCalendar = unicode(read(cal), config.get("encoding", "stock"))
|
||||||
oldTzs = [tz.tzid for tz in ical.timezones(oldCalendar)]
|
oldTzs = [tz.tzid for tz in ical.timezones(oldCalendar)]
|
||||||
path = os.path.join(_folder, cal.replace(posixpath.sep, os.path.sep))
|
path = os.path.join(_folder, cal.replace(posixpath.sep, os.path.sep))
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ def remove(cal, etag):
|
|||||||
"""
|
"""
|
||||||
path = os.path.join(_folder, cal.replace(posixpath.sep, os.path.sep))
|
path = os.path.join(_folder, cal.replace(posixpath.sep, os.path.sep))
|
||||||
|
|
||||||
cal = read(cal)
|
cal = unicode(read(cal), config.get("encoding", "stock"))
|
||||||
|
|
||||||
headers = ical.headers(cal)
|
headers = ical.headers(cal)
|
||||||
timezones = ical.timezones(cal)
|
timezones = ical.timezones(cal)
|
||||||
|
Loading…
Reference in New Issue
Block a user