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

Co-Authored-By: Akihiro Motoki <amotoki@gmail.com>
Change-Id: I4b9edb326444264c0f6c4ad281acaac356a07e85
Implements: blueprint replace-iteritems-with-items

2 files changed, 7 insertions, 8 deletions

diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index c2dab3ee..a711a128 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -28,7 +28,6 @@ from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -271,7 +270,7 @@ class CreateImage(command.ShowOne):
             info.update(image._info)
             info['properties'] = format_columns.DictColumn(
                 info.get('properties', {}))
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteImage(command.Command):
@@ -718,4 +717,4 @@ class ShowImage(command.ShowOne):
                 info['size'] = utils.format_size(info['size'])
         info['properties'] = format_columns.DictColumn(
             info.get('properties', {}))
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 2b10c3ad..feeb2567 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -110,7 +110,7 @@ class AddProjectToImage(command.ShowOne):
             project_id,
         )
 
-        return zip(*sorted(six.iteritems(image_member)))
+        return zip(*sorted(image_member.items()))
 
 
 class CreateImage(command.ShowOne):
@@ -292,7 +292,7 @@ class CreateImage(command.ShowOne):
 
         # properties should get flattened into the general kwargs
         if getattr(parsed_args, 'properties', None):
-            for k, v in six.iteritems(parsed_args.properties):
+            for k, v in parsed_args.properties.items():
                 kwargs[k] = str(v)
 
         # Handle exclusive booleans with care
@@ -417,7 +417,7 @@ class CreateImage(command.ShowOne):
         if not info:
             info = _format_image(image)
 
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteImage(command.Command):
@@ -969,7 +969,7 @@ class SetImage(command.Command):
 
         # Properties should get flattened into the general kwargs
         if getattr(parsed_args, 'properties', None):
-            for k, v in six.iteritems(parsed_args.properties):
+            for k, v in parsed_args.properties.items():
                 kwargs[k] = str(v)
 
         # Handle exclusive booleans with care
@@ -1066,7 +1066,7 @@ class ShowImage(command.ShowOne):
             image['size'] = utils.format_size(image['size'])
 
         info = _format_image(image)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class UnsetImage(command.Command):