From 64c98b814b5927b89d2521218abcd99d37330836 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 29 Sep 2012 07:18:20 -0400
Subject: [PATCH] proxy: convert iteritems() and and itervalues() to items()
and values()
The former no longer exist in Python 3.
---
plugins/proxy.py | 4 ++--
1 file 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:
--
2.39.5