Replace six.iteritems() with .items()

1.As mentioned in [1], we should avoid using
six.iteritems to achieve iterators. We can use
dict.items instead, as it will return iterators
in PY3 as well. And dict.items/keys will more
readable. 2.In py2, the performance about list
should be negligible, see the link [2].
[1] https://wiki.openstack.org/wiki/Python3
[2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html

Change-Id: I87523bb98b3b8691d0907697d7992b28681dc8f5
This commit is contained in:
Cady_Chen 2016-12-07 11:05:08 +08:00
parent d9724e2deb
commit 5a22b6a73b

View File

@ -220,7 +220,7 @@ def _extract_attributes(image, include_locations=False):
output = {'properties': {}, 'deleted': False, 'deleted_at': None,
'disk_format': None, 'container_format': None, 'name': None,
'checksum': None}
for name, value in six.iteritems(image):
for name, value in image.items():
if (name in omit_attrs
or name in include_locations_attrs and not include_locations):
continue