aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-07-10 18:00:53 -0400
committerJoey Hess <joey@kitenet.net>2013-07-10 18:00:53 -0400
commit86abde54c0b63dedcf62a9a6ccc6870e1af96c54 (patch)
treecff8491b6e38de54b49d16914d8da1c845a5590a
parent46e0c5742ce2d380904987b8a2655fe157faca3e (diff)
downloadikiwiki-86abde54c0b63dedcf62a9a6ccc6870e1af96c54.tar
ikiwiki-86abde54c0b63dedcf62a9a6ccc6870e1af96c54.tar.gz
Fix python proxy to not crash when fed unicode data in getstate and setstate.
-rw-r--r--doc/bugs/proxy.py_utf8_troubles.mdwn2
-rwxr-xr-xplugins/proxy.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/bugs/proxy.py_utf8_troubles.mdwn b/doc/bugs/proxy.py_utf8_troubles.mdwn
index a4e848102..7e8f70e59 100644
--- a/doc/bugs/proxy.py_utf8_troubles.mdwn
+++ b/doc/bugs/proxy.py_utf8_troubles.mdwn
@@ -31,3 +31,5 @@ python3 and we'd just move the problem to the stderr writing later on; instead,
debug output doesn't look that pretty any more, but is safe.
--[[chrysn]]
+
+> ok, [[done]] --[[Joey]]
diff --git a/plugins/proxy.py b/plugins/proxy.py
index 41cc45700..ca731301f 100755
--- a/plugins/proxy.py
+++ b/plugins/proxy.py
@@ -175,7 +175,7 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
data = _xmlrpc_client.loads(xml)[0][0]
self._debug_fn(
'parsed data from response to procedure {0}: [{1}]'.format(
- cmd, data))
+ cmd, repr(data)))
return data
def handle_rpc(self, in_fd, out_fd):