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>

ipaserver/install/plugins/update_managed_permissions.py

@@ -399,10 +399,10 @@ class update_managed_permissions(Updater):
         """
         for obj in sorted(self.api.Object(), key=lambda o: o.name):
             managed_permissions = getattr(obj, 'managed_permissions', {})
-            for name, template in sorted(managed_permissions.iteritems()):
+            for name, template in sorted(managed_permissions.items()):
                 yield name, template, obj
 
-        for name, template in sorted(NONOBJECT_PERMISSIONS.iteritems()):
+        for name, template in sorted(NONOBJECT_PERMISSIONS.items()):
             yield name, template, None
 
 

ipaserver/install/plugins/update_referint.py

@@ -63,7 +63,7 @@ class update_referint(Updater):
             entry['nsslapd-pluginArg2'] = None
 
         # nsslapd-pluginArg3..N -> referint-membership-attr [3..N]
-        for key in entry.keys():
+        for key in list(entry):
             if key.lower().startswith('nsslapd-pluginarg'):
                 arg_val = entry.single_value[key]
                 if arg_val: