diff options
| author | W. Trevor King <wking@tremily.us> | 2012-09-29 07:18:20 -0400 |
|---|---|---|
| committer | W. Trevor King <wking@tremily.us> | 2012-09-29 07:18:25 -0400 |
| commit | 64c98b814b5927b89d2521218abcd99d37330836 (patch) | |
| tree | b2f110f003ecd1fb21d2ae870d3a7cdc71038c3c /plugins | |
| parent | 409f9341d17ba88685f08b561378d6c0c783b405 (diff) | |
| download | ikiwiki-64c98b814b5927b89d2521218abcd99d37330836.tar ikiwiki-64c98b814b5927b89d2521218abcd99d37330836.tar.gz | |
proxy: convert iteritems() and and itervalues() to items() and values()
The former no longer exist in Python 3.
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/proxy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/proxy.py b/plugins/proxy.py index 656c9e5bd..176203989 100755 --- a/plugins/proxy.py +++ b/plugins/proxy.py @@ -156,7 +156,7 @@ class _IkiWikiExtPluginXMLRPCHandler(object): return ret def send_rpc(self, cmd, in_fd, out_fd, *args, **kwargs): - xml = _xmlrpc_client.dumps(sum(kwargs.iteritems(), args), cmd) + xml = _xmlrpc_client.dumps(sum(kwargs.items(), args), cmd) self._debug_fn("calling ikiwiki procedure `{}': [{}]".format(cmd, xml)) _IkiWikiExtPluginXMLRPCHandler._write(out_fd, xml) @@ -227,7 +227,7 @@ class IkiWikiProcedureProxy(object): yield i args = list(subst_none(args)) - kwargs = dict(zip(kwargs.keys(), list(subst_none(kwargs.itervalues())))) + kwargs = dict(zip(kwargs.keys(), list(subst_none(kwargs.values())))) ret = self._xmlrpc_handler.send_rpc(cmd, self._in_fd, self._out_fd, *args, **kwargs) if ret == IkiWikiProcedureProxy._IKIWIKI_NIL_SENTINEL: |