IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use Python3-compatible dict method names

Browse Source 
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>
This commit is contained in:
Petr Viktorin
2015-08-11 13:51:14 +02:00
committed by Jan Cholasta
parent dd16cc98b0
commit 3bf91eab25
56 changed files with 182 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipalib/frontend.py
View File

@@ -614,7 +614,7 @@ class Command(HasParam):
{'last': u'DOE', 'first': u'john'}
"""
return dict(
(k, self.params[k].normalize(v)) for (k, v) in kw.iteritems()
(k, self.params[k].normalize(v)) for (k, v) in kw.items()
)
def convert(self, **kw):
@@ -634,7 +634,7 @@ class Command(HasParam):
{'two': u'2', 'one': 1}
"""
return dict(
(k, self.params[k].convert(v)) for (k, v) in kw.iteritems()
(k, self.params[k].convert(v)) for (k, v) in kw.items()
)
def __convert_iter(self, kw):