Replace six.iteritems() with .items()

1.As mentioned in [1], we should avoid usingg
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: I71c13040318eca6e5ed993e8aa03f8003986a71c
This commit is contained in:
ji-xuepeng
2017-02-08 16:27:54 +08:00
parent c1f54742f9
commit 5fca39dbde
11 changed files with 22 additions and 25 deletions
+4 -4
View File
@@ -122,7 +122,7 @@ def schema_args(schema_getter, omit=None):
kwargs))
else:
properties = schema.get('properties', {})
for name, property in six.iteritems(properties):
for name, property in properties.items():
if name in omit:
continue
param = '--' + name.replace('_', '-')
@@ -186,7 +186,7 @@ def print_list(objs, fields, formatters=None, field_settings=None):
row = []
for field in fields:
if field in field_settings:
for setting, value in six.iteritems(field_settings[field]):
for setting, value in field_settings[field].items():
setting_dict = getattr(pt, setting)
setting_dict[field] = value
@@ -205,7 +205,7 @@ def print_dict(d, max_column_width=80):
pt = prettytable.PrettyTable(['Property', 'Value'], caching=False)
pt.align = 'l'
pt.max_width = max_column_width
for k, v in six.iteritems(d):
for k, v in d.items():
if isinstance(v, (dict, list)):
v = json.dumps(v)
pt.add_row([k, v])
@@ -388,7 +388,7 @@ def strip_version(endpoint):
def print_image(image_obj, human_readable=False, max_col_width=None):
ignore = ['self', 'access', 'file', 'schema']
image = dict([item for item in six.iteritems(image_obj)
image = dict([item for item in image_obj.items()
if item[0] not in ignore])
if human_readable:
image['size'] = make_size_human_readable(image['size'])