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

Minor py3k compatibility changes: iteritems() doesn't exist on Python 3.x, logged text must be Unicode.

Browse Source
This commit is contained in:
Lukasz Langa 2011-05-10 19:16:03 +02:00
parent 0d8fa5db6b
commit 485e375139
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
radicale/__init__.py
View File

@ -190,7 +190,11 @@ class Application(object):
# Set content length # Set content length
if answer: if answer:
log.LOGGER.debug("Response content:\n%s" % answer) # decoding the answer for logging purposes on Python 3
log_answer = answer
if not isinstance(log_answer, str):
log_answer = log_answer.decode(config.get("encoding", "request"))
log.LOGGER.debug("Response content:\n%s" % log_answer)
headers["Content-Length"] = "%i" % len(answer) headers["Content-Length"] = "%i" % len(answer)
# Start response # Start response

2
radicale/xmlutils.py
View File

@ -38,7 +38,7 @@ NAMESPACES = {
"CS": "http://calendarserver.org/ns/"} "CS": "http://calendarserver.org/ns/"}
for short, url in NAMESPACES.iteritems(): for short, url in NAMESPACES.items():
ET._namespace_map[url] = short ET._namespace_map[url] = short