urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugins/proxy.py: be compatible with Python 3

master
Simon McVittie 2014-09-04 11:42:05 +01:00
parent 81506fae8a
commit 38bd51bc1b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/proxy.py
View File

@ -159,7 +159,8 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
xml = _xmlrpc_client.dumps(sum(kwargs.items(), args), cmd) xml = _xmlrpc_client.dumps(sum(kwargs.items(), args), cmd)
self._debug_fn( self._debug_fn(
"calling ikiwiki procedure `{0}': [{1}]".format(cmd, repr(xml))) "calling ikiwiki procedure `{0}': [{1}]".format(cmd, repr(xml)))
if isinstance(xml, unicode): # ensure that encoded is a str (bytestring in Python 2, Unicode in 3)
if str is bytes and not isinstance(xml, str):
encoded = xml.encode('utf8') encoded = xml.encode('utf8')
else: else:
encoded = xml encoded = xml
@ -168,7 +169,7 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
self._debug_fn('reading response from ikiwiki...') self._debug_fn('reading response from ikiwiki...')
response = _IkiWikiExtPluginXMLRPCHandler._read(in_fd) response = _IkiWikiExtPluginXMLRPCHandler._read(in_fd)
if isinstance(response, unicode): if str is bytes and not isinstance(response, str):
xml = response.encode('utf8') xml = response.encode('utf8')
else: else:
xml = response xml = response