Use Python3-compatible dict method names

Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.

Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.

When iterating through the entire dict, without modifying the dict,
 the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.

In other cases, helpers like six.itervalues are used.

Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 0dc897a08..b76d27885 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -159,7 +159,7 @@ def xml_wrap(value, version):
         return tuple(xml_wrap(v, version) for v in value)
     if isinstance(value, dict):
         return dict(
-            (k, xml_wrap(v, version)) for (k, v) in value.iteritems()
+            (k, xml_wrap(v, version)) for (k, v) in value.items()
         )
     if type(value) is str:
         return Binary(value)
@@ -213,7 +213,7 @@ def xml_unwrap(value, encoding='UTF-8'):
             return DNSName(value['__dns_name__'])
         else:
             return dict(
-                (k, xml_unwrap(v, encoding)) for (k, v) in value.iteritems()
+                (k, xml_unwrap(v, encoding)) for (k, v) in value.items()
             )
     if type(value) is str:
         return value.decode(encoding)