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

8 files changed, 17 insertions, 25 deletions

diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 5d1e3062..ccedbf33 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -19,7 +19,6 @@ from cliff import columns as cliff_columns
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -102,4 +101,4 @@ class ShowCatalog(command.ShowOne):
             LOG.error(_('service %s not found\n'), parsed_args.service)
             return ((), ())
 
-        return zip(*sorted(six.iteritems(data)))
+        return zip(*sorted(data.items()))
diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py
index 0bc48322..f712bf45 100644
--- a/openstackclient/identity/v2_0/ec2creds.py
+++ b/openstackclient/identity/v2_0/ec2creds.py
@@ -21,7 +21,6 @@ import logging
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -82,7 +81,7 @@ class CreateEC2Creds(command.ShowOne):
                 {'project_id': info.pop('tenant_id')}
             )
 
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteEC2Creds(command.Command):
@@ -206,4 +205,4 @@ class ShowEC2Creds(command.ShowOne):
                 {'project_id': info.pop('tenant_id')}
             )
 
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index 1628e488..57906ddf 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -20,7 +20,6 @@ import logging
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 from openstackclient.identity import common
@@ -76,7 +75,7 @@ class CreateEndpoint(command.ShowOne):
         info.update(endpoint._info)
         info['service_name'] = service.name
         info['service_type'] = service.type
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteEndpoint(command.Command):
@@ -178,4 +177,4 @@ class ShowEndpoint(command.ShowOne):
         info.update(match._info)
         info['service_name'] = service.name
         info['service_type'] = service.type
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index e0018860..f431c021 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -23,7 +23,6 @@ from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -100,7 +99,7 @@ class CreateProject(command.ShowOne):
 
         # TODO(stevemar): Remove the line below when we support multitenancy
         project._info.pop('parent_id', None)
-        return zip(*sorted(six.iteritems(project._info)))
+        return zip(*sorted(project._info.items()))
 
 
 class DeleteProject(command.Command):
@@ -299,7 +298,7 @@ class ShowProject(command.ShowOne):
                     properties[k] = v
 
         info['properties'] = format_columns.DictColumn(properties)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class UnsetProject(command.Command):
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index e9fe50fa..5c53fbcd 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -21,7 +21,6 @@ from keystoneauth1 import exceptions as ks_exc
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -69,7 +68,7 @@ class AddRole(command.ShowOne):
 
         info = {}
         info.update(role._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class CreateRole(command.ShowOne):
@@ -105,7 +104,7 @@ class CreateRole(command.ShowOne):
 
         info = {}
         info.update(role._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteRole(command.Command):
@@ -217,4 +216,4 @@ class ShowRole(command.ShowOne):
 
         info = {}
         info.update(role._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 653de8eb..afc0b3d7 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -20,7 +20,6 @@ import logging
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 from openstackclient.identity import common
@@ -65,7 +64,7 @@ class CreateService(command.ShowOne):
 
         info = {}
         info.update(service._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteService(command.Command):
@@ -153,11 +152,11 @@ class ShowService(command.ShowOne):
         if parsed_args.catalog:
             endpoints = auth_ref.service_catalog.get_endpoints(
                 service_type=parsed_args.service)
-            for (service, service_endpoints) in six.iteritems(endpoints):
+            for (service, service_endpoints) in endpoints.items():
                 if service_endpoints:
                     info = {"type": service}
                     info.update(service_endpoints[0])
-                    return zip(*sorted(six.iteritems(info)))
+                    return zip(*sorted(info.items()))
 
             msg = _("No service catalog with a type, name or ID of '%s' "
                     "exists.") % (parsed_args.service)
@@ -166,4 +165,4 @@ class ShowService(command.ShowOne):
             service = common.find_service(identity_client, parsed_args.service)
             info = {}
             info.update(service._info)
-            return zip(*sorted(six.iteritems(info)))
+            return zip(*sorted(info.items()))
diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py
index 3b08b475..205e15d3 100644
--- a/openstackclient/identity/v2_0/token.py
+++ b/openstackclient/identity/v2_0/token.py
@@ -17,7 +17,6 @@
 
 from osc_lib.command import command
 from osc_lib import exceptions
-import six
 
 from openstackclient.i18n import _
 
@@ -49,7 +48,7 @@ class IssueToken(command.ShowOne):
             data['project_id'] = auth_ref.project_id
         if auth_ref.user_id:
             data['user_id'] = auth_ref.user_id
-        return zip(*sorted(six.iteritems(data)))
+        return zip(*sorted(data.items()))
 
 
 class RevokeToken(command.Command):
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 0675877b..8dac093e 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -23,7 +23,6 @@ from keystoneauth1 import exceptions as ks_exc
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -154,7 +153,7 @@ class CreateUser(command.ShowOne):
 
         info = {}
         info.update(user._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteUser(command.Command):
@@ -418,4 +417,4 @@ class ShowUser(command.ShowOne):
                 {'project_id': info.pop('tenant_id')}
             )
 
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))