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

4 files changed, 6 insertions, 10 deletions

diff --git a/openstackclient/common/availability_zone.py b/openstackclient/common/availability_zone.py
index b2385ef7..3b2fa848 100644
--- a/openstackclient/common/availability_zone.py
+++ b/openstackclient/common/availability_zone.py
@@ -19,7 +19,6 @@ import logging
 from novaclient import exceptions as nova_exceptions
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -47,11 +46,11 @@ def _xform_compute_availability_zone(az, include_extra):
         return result
 
     if hasattr(az, 'hosts') and az.hosts:
-        for host, services in six.iteritems(az.hosts):
+        for host, services in az.hosts.items():
             host_info = copy.deepcopy(zone_info)
             host_info['host_name'] = host
 
-            for svc, state in six.iteritems(services):
+            for svc, state in services.items():
                 info = copy.deepcopy(host_info)
                 info['service_name'] = svc
                 info['service_status'] = '%s %s %s' % (
diff --git a/openstackclient/common/configuration.py b/openstackclient/common/configuration.py
index 53b30d5f..49ef0e05 100644
--- a/openstackclient/common/configuration.py
+++ b/openstackclient/common/configuration.py
@@ -15,7 +15,6 @@
 
 from keystoneauth1.loading import base
 from osc_lib.command import command
-import six
 
 from openstackclient.i18n import _
 
@@ -59,9 +58,9 @@ class ShowConfiguration(command.ShowOne):
                 if o.secret
             ]
 
-        for key, value in six.iteritems(info.pop('auth', {})):
+        for key, value in info.pop('auth', {}).items():
             if parsed_args.mask and key.lower() in secret_opts:
                 value = REDACTED
             info['auth.' + key] = value
 
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
diff --git a/openstackclient/common/module.py b/openstackclient/common/module.py
index 20497f21..f55fdce0 100644
--- a/openstackclient/common/module.py
+++ b/openstackclient/common/module.py
@@ -19,7 +19,6 @@ import sys
 
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -113,4 +112,4 @@ class ListModule(command.ShowOne):
                         # Catch all exceptions, just skip it
                         pass
 
-        return zip(*sorted(six.iteritems(data)))
+        return zip(*sorted(data.items()))
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py
index 80c8749a..c7b3ad07 100644
--- a/openstackclient/common/quota.py
+++ b/openstackclient/common/quota.py
@@ -21,7 +21,6 @@ import sys
 
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 from openstackclient.network import common
@@ -663,4 +662,4 @@ class ShowQuota(command.ShowOne, BaseQuota):
             project_name = project_info['name']
             info['project_name'] = project_name
 
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))