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

32 files changed, 68 insertions, 100 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()))
diff --git a/openstackclient/identity/v3/application_credential.py b/openstackclient/identity/v3/application_credential.py
index 747fa20e..ea0b30cd 100644
--- a/openstackclient/identity/v3/application_credential.py
+++ b/openstackclient/identity/v3/application_credential.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 _
 from openstackclient.identity import common
@@ -123,7 +122,7 @@ class CreateApplicationCredential(command.ShowOne):
         msg = ' '.join(r['name'] for r in roles)
         application_credential._info['roles'] = msg
 
-        return zip(*sorted(six.iteritems(application_credential._info)))
+        return zip(*sorted(application_credential._info.items()))
 
 
 class DeleteApplicationCredential(command.Command):
@@ -217,4 +216,4 @@ class ShowApplicationCredential(command.ShowOne):
         msg = ' '.join(r['name'] for r in roles)
         app_cred._info['roles'] = msg
 
-        return zip(*sorted(six.iteritems(app_cred._info)))
+        return zip(*sorted(app_cred._info.items()))
diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py
index 59430c4c..d1f7d319 100644
--- a/openstackclient/identity/v3/catalog.py
+++ b/openstackclient/identity/v3/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 _
 
@@ -97,4 +96,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/v3/consumer.py b/openstackclient/identity/v3/consumer.py
index 6dd24dcc..2f925aba 100644
--- a/openstackclient/identity/v3/consumer.py
+++ b/openstackclient/identity/v3/consumer.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 _
 
@@ -46,7 +45,7 @@ class CreateConsumer(command.ShowOne):
             parsed_args.description
         )
         consumer._info.pop('links', None)
-        return zip(*sorted(six.iteritems(consumer._info)))
+        return zip(*sorted(consumer._info.items()))
 
 
 class DeleteConsumer(command.Command):
@@ -142,4 +141,4 @@ class ShowConsumer(command.ShowOne):
             identity_client.oauth1.consumers, parsed_args.consumer)
 
         consumer._info.pop('links', None)
-        return zip(*sorted(six.iteritems(consumer._info)))
+        return zip(*sorted(consumer._info.items()))
diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
index 981f940a..bf48df83 100644
--- a/openstackclient/identity/v3/credential.py
+++ b/openstackclient/identity/v3/credential.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
@@ -74,7 +73,7 @@ class CreateCredential(command.ShowOne):
             project=project)
 
         credential._info.pop('links')
-        return zip(*sorted(six.iteritems(credential._info)))
+        return zip(*sorted(credential._info.items()))
 
 
 class DeleteCredential(command.Command):
@@ -225,4 +224,4 @@ class ShowCredential(command.ShowOne):
                                          parsed_args.credential)
 
         credential._info.pop('links')
-        return zip(*sorted(six.iteritems(credential._info)))
+        return zip(*sorted(credential._info.items()))
diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index 064624ab..dbcc97f6 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.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 _
 from openstackclient.identity import common
@@ -85,7 +84,7 @@ class CreateDomain(command.ShowOne):
                 raise
 
         domain._info.pop('links')
-        return zip(*sorted(six.iteritems(domain._info)))
+        return zip(*sorted(domain._info.items()))
 
 
 class DeleteDomain(command.Command):
@@ -206,4 +205,4 @@ class ShowDomain(command.ShowOne):
                                      domain_str)
 
         domain._info.pop('links')
-        return zip(*sorted(six.iteritems(domain._info)))
+        return zip(*sorted(domain._info.items()))
diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py
index 44e9a2c7..921b9168 100644
--- a/openstackclient/identity/v3/ec2creds.py
+++ b/openstackclient/identity/v3/ec2creds.py
@@ -17,7 +17,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
@@ -108,7 +107,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):
@@ -209,4 +208,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/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index 858b5036..a3bd2683 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/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
@@ -131,7 +130,7 @@ class CreateEndpoint(command.ShowOne):
         info.update(endpoint._info)
         info['service_name'] = get_service_name(service)
         info['service_type'] = service.type
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteEndpoint(command.Command):
@@ -389,4 +388,4 @@ class ShowEndpoint(command.ShowOne):
         info.update(endpoint._info)
         info['service_name'] = get_service_name(service)
         info['service_type'] = service.type
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
diff --git a/openstackclient/identity/v3/endpoint_group.py b/openstackclient/identity/v3/endpoint_group.py
index 66bd164d..cbe27edb 100644
--- a/openstackclient/identity/v3/endpoint_group.py
+++ b/openstackclient/identity/v3/endpoint_group.py
@@ -19,7 +19,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
@@ -129,7 +128,7 @@ class CreateEndpointGroup(command.ShowOne, _FiltersReader):
         info = {}
         endpoint_group._info.pop('links')
         info.update(endpoint_group._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteEndpointGroup(command.Command):
@@ -321,4 +320,4 @@ class ShowEndpointGroup(command.ShowOne):
         info = {}
         endpoint_group._info.pop('links')
         info.update(endpoint_group._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
diff --git a/openstackclient/identity/v3/federation_protocol.py b/openstackclient/identity/v3/federation_protocol.py
index 6429d934..0929469e 100644
--- a/openstackclient/identity/v3/federation_protocol.py
+++ b/openstackclient/identity/v3/federation_protocol.py
@@ -19,7 +19,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 _
 
@@ -68,7 +67,7 @@ class CreateProtocol(command.ShowOne):
         info['identity_provider'] = parsed_args.identity_provider
         info['mapping'] = info.pop('mapping_id')
         info.pop('links', None)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteProtocol(command.Command):
@@ -175,7 +174,7 @@ class SetProtocol(command.Command):
         # user.
         info['identity_provider'] = parsed_args.identity_provider
         info['mapping'] = info.pop('mapping_id')
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class ShowProtocol(command.ShowOne):
@@ -205,4 +204,4 @@ class ShowProtocol(command.ShowOne):
         info = dict(protocol._info)
         info['mapping'] = info.pop('mapping_id')
         info.pop('links', None)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index 02eeadd6..46c3142c 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.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 _
 from openstackclient.identity import common
@@ -182,7 +181,7 @@ class CreateGroup(command.ShowOne):
                 raise
 
         group._info.pop('links')
-        return zip(*sorted(six.iteritems(group._info)))
+        return zip(*sorted(group._info.items()))
 
 
 class DeleteGroup(command.Command):
@@ -405,4 +404,4 @@ class ShowGroup(command.ShowOne):
                                   domain_name_or_id=parsed_args.domain)
 
         group._info.pop('links')
-        return zip(*sorted(six.iteritems(group._info)))
+        return zip(*sorted(group._info.items()))
diff --git a/openstackclient/identity/v3/identity_provider.py b/openstackclient/identity/v3/identity_provider.py
index b3315182..2b2d9d11 100644
--- a/openstackclient/identity/v3/identity_provider.py
+++ b/openstackclient/identity/v3/identity_provider.py
@@ -19,7 +19,6 @@ from osc_lib.cli import format_columns
 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
@@ -106,7 +105,7 @@ class CreateIdentityProvider(command.ShowOne):
         idp._info.pop('links', None)
         remote_ids = format_columns.ListColumn(idp._info.pop('remote_ids', []))
         idp._info['remote_ids'] = remote_ids
-        return zip(*sorted(six.iteritems(idp._info)))
+        return zip(*sorted(idp._info.items()))
 
 
 class DeleteIdentityProvider(command.Command):
@@ -248,4 +247,4 @@ class ShowIdentityProvider(command.ShowOne):
         idp._info.pop('links', None)
         remote_ids = format_columns.ListColumn(idp._info.pop('remote_ids', []))
         idp._info['remote_ids'] = remote_ids
-        return zip(*sorted(six.iteritems(idp._info)))
+        return zip(*sorted(idp._info.items()))
diff --git a/openstackclient/identity/v3/implied_role.py b/openstackclient/identity/v3/implied_role.py
index 4e3df88a..054f3028 100644
--- a/openstackclient/identity/v3/implied_role.py
+++ b/openstackclient/identity/v3/implied_role.py
@@ -18,7 +18,6 @@
 import logging
 
 from osc_lib.command import command
-import six
 
 from openstackclient.i18n import _
 
@@ -75,7 +74,7 @@ class CreateImpliedRole(command.ShowOne):
             prior_role_id, implied_role_id)
         response._info.pop('links', None)
         return zip(*sorted([(k, v['id'])
-                            for k, v in six.iteritems(response._info)]))
+                            for k, v in response._info.items()]))
 
 
 class DeleteImpliedRole(command.Command):
diff --git a/openstackclient/identity/v3/limit.py b/openstackclient/identity/v3/limit.py
index f2af81e9..b155cbd8 100644
--- a/openstackclient/identity/v3/limit.py
+++ b/openstackclient/identity/v3/limit.py
@@ -18,7 +18,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 as common_utils
@@ -102,7 +101,7 @@ class CreateLimit(command.ShowOne):
         )
 
         limit._info.pop('links', None)
-        return zip(*sorted(six.iteritems(limit._info)))
+        return zip(*sorted(limit._info.items()))
 
 
 class ListLimit(command.Lister):
@@ -198,7 +197,7 @@ class ShowLimit(command.ShowOne):
         identity_client = self.app.client_manager.identity
         limit = identity_client.limits.get(parsed_args.limit_id)
         limit._info.pop('links', None)
-        return zip(*sorted(six.iteritems(limit._info)))
+        return zip(*sorted(limit._info.items()))
 
 
 class SetLimit(command.ShowOne):
@@ -236,7 +235,7 @@ class SetLimit(command.ShowOne):
 
         limit._info.pop('links', None)
 
-        return zip(*sorted(six.iteritems(limit._info)))
+        return zip(*sorted(limit._info.items()))
 
 
 class DeleteLimit(command.Command):
diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py
index e729c410..7d40a2b7 100644
--- a/openstackclient/identity/v3/mapping.py
+++ b/openstackclient/identity/v3/mapping.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 _
 
@@ -107,7 +106,7 @@ class CreateMapping(command.ShowOne, _RulesReader):
             rules=rules)
 
         mapping._info.pop('links', None)
-        return zip(*sorted(six.iteritems(mapping._info)))
+        return zip(*sorted(mapping._info.items()))
 
 
 class DeleteMapping(command.Command):
@@ -202,4 +201,4 @@ class ShowMapping(command.ShowOne):
         mapping = identity_client.federation.mappings.get(parsed_args.mapping)
 
         mapping._info.pop('links', None)
-        return zip(*sorted(six.iteritems(mapping._info)))
+        return zip(*sorted(mapping._info.items()))
diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py
index 3b644195..45674210 100644
--- a/openstackclient/identity/v3/policy.py
+++ b/openstackclient/identity/v3/policy.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 _
 
@@ -57,7 +56,7 @@ class CreatePolicy(command.ShowOne):
 
         policy._info.pop('links')
         policy._info.update({'rules': policy._info.pop('blob')})
-        return zip(*sorted(six.iteritems(policy._info)))
+        return zip(*sorted(policy._info.items()))
 
 
 class DeletePolicy(command.Command):
@@ -176,4 +175,4 @@ class ShowPolicy(command.ShowOne):
 
         policy._info.pop('links')
         policy._info.update({'rules': policy._info.pop('blob')})
-        return zip(*sorted(six.iteritems(policy._info)))
+        return zip(*sorted(policy._info.items()))
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 073fb6df..9ecc70ef 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -22,7 +22,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 _
 from openstackclient.identity import common
@@ -124,7 +123,7 @@ class CreateProject(command.ShowOne):
                 raise
 
         project._info.pop('links')
-        return zip(*sorted(six.iteritems(project._info)))
+        return zip(*sorted(project._info.items()))
 
 
 class DeleteProject(command.Command):
@@ -401,4 +400,4 @@ class ShowProject(command.ShowOne):
                 subtree_as_ids=parsed_args.children)
 
         project._info.pop('links')
-        return zip(*sorted(six.iteritems(project._info)))
+        return zip(*sorted(project._info.items()))
diff --git a/openstackclient/identity/v3/region.py b/openstackclient/identity/v3/region.py
index 69c8b506..20ee073c 100644
--- a/openstackclient/identity/v3/region.py
+++ b/openstackclient/identity/v3/region.py
@@ -18,7 +18,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 _
 
@@ -62,7 +61,7 @@ class CreateRegion(command.ShowOne):
         region._info['region'] = region._info.pop('id')
         region._info['parent_region'] = region._info.pop('parent_region_id')
         region._info.pop('links', None)
-        return zip(*sorted(six.iteritems(region._info)))
+        return zip(*sorted(region._info.items()))
 
 
 class DeleteRegion(command.Command):
@@ -181,4 +180,4 @@ class ShowRegion(command.ShowOne):
         region._info['region'] = region._info.pop('id')
         region._info['parent_region'] = region._info.pop('parent_region_id')
         region._info.pop('links', None)
-        return zip(*sorted(six.iteritems(region._info)))
+        return zip(*sorted(region._info.items()))
diff --git a/openstackclient/identity/v3/registered_limit.py b/openstackclient/identity/v3/registered_limit.py
index 9366ec1e..53117c71 100644
--- a/openstackclient/identity/v3/registered_limit.py
+++ b/openstackclient/identity/v3/registered_limit.py
@@ -18,7 +18,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 as common_utils
@@ -92,7 +91,7 @@ class CreateRegisteredLimit(command.ShowOne):
         )
 
         registered_limit._info.pop('links', None)
-        return zip(*sorted(six.iteritems(registered_limit._info)))
+        return zip(*sorted(registered_limit._info.items()))
 
 
 class DeleteRegisteredLimit(command.Command):
@@ -275,7 +274,7 @@ class SetRegisteredLimit(command.ShowOne):
         )
 
         registered_limit._info.pop('links', None)
-        return zip(*sorted(six.iteritems(registered_limit._info)))
+        return zip(*sorted(registered_limit._info.items()))
 
 
 class ShowRegisteredLimit(command.ShowOne):
@@ -296,4 +295,4 @@ class ShowRegisteredLimit(command.ShowOne):
             parsed_args.registered_limit_id
         )
         registered_limit._info.pop('links', None)
-        return zip(*sorted(six.iteritems(registered_limit._info)))
+        return zip(*sorted(registered_limit._info.items()))
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 0eeddd37..986f823f 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/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 _
 from openstackclient.identity import common
@@ -211,7 +210,7 @@ class CreateRole(command.ShowOne):
                 raise
 
         role._info.pop('links')
-        return zip(*sorted(six.iteritems(role._info)))
+        return zip(*sorted(role._info.items()))
 
 
 class DeleteRole(command.Command):
@@ -403,4 +402,4 @@ class ShowRole(command.ShowOne):
                                    domain_id=domain_id)
 
         role._info.pop('links')
-        return zip(*sorted(six.iteritems(role._info)))
+        return zip(*sorted(role._info.items()))
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
index ac8d8d9e..9dc66962 100644
--- a/openstackclient/identity/v3/service.py
+++ b/openstackclient/identity/v3/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
@@ -77,7 +76,7 @@ class CreateService(command.ShowOne):
         )
 
         service._info.pop('links')
-        return zip(*sorted(six.iteritems(service._info)))
+        return zip(*sorted(service._info.items()))
 
 
 class DeleteService(command.Command):
@@ -218,4 +217,4 @@ class ShowService(command.ShowOne):
         service = common.find_service(identity_client, parsed_args.service)
 
         service._info.pop('links')
-        return zip(*sorted(six.iteritems(service._info)))
+        return zip(*sorted(service._info.items()))
diff --git a/openstackclient/identity/v3/service_provider.py b/openstackclient/identity/v3/service_provider.py
index bb2d9917..e106c787 100644
--- a/openstackclient/identity/v3/service_provider.py
+++ b/openstackclient/identity/v3/service_provider.py
@@ -18,7 +18,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 _
 
@@ -83,7 +82,7 @@ class CreateServiceProvider(command.ShowOne):
             sp_url=parsed_args.service_provider_url)
 
         sp._info.pop('links', None)
-        return zip(*sorted(six.iteritems(sp._info)))
+        return zip(*sorted(sp._info.items()))
 
 
 class DeleteServiceProvider(command.Command):
@@ -211,4 +210,4 @@ class ShowServiceProvider(command.ShowOne):
             id=parsed_args.service_provider)
 
         service_provider._info.pop('links', None)
-        return zip(*sorted(six.iteritems(service_provider._info)))
+        return zip(*sorted(service_provider._info.items()))
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index 1933ecad..f14dd8bc 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -18,7 +18,6 @@
 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
@@ -62,7 +61,7 @@ class AuthorizeRequestToken(command.ShowOne):
             parsed_args.request_key,
             roles)
 
-        return zip(*sorted(six.iteritems(verifier_pin._info)))
+        return zip(*sorted(verifier_pin._info.items()))
 
 
 class CreateAccessToken(command.ShowOne):
@@ -108,7 +107,7 @@ class CreateAccessToken(command.ShowOne):
             parsed_args.consumer_key, parsed_args.consumer_secret,
             parsed_args.request_key, parsed_args.request_secret,
             parsed_args.verifier)
-        return zip(*sorted(six.iteritems(access_token._info)))
+        return zip(*sorted(access_token._info.items()))
 
 
 class CreateRequestToken(command.ShowOne):
@@ -160,7 +159,7 @@ class CreateRequestToken(command.ShowOne):
             parsed_args.consumer_key,
             parsed_args.consumer_secret,
             project.id)
-        return zip(*sorted(six.iteritems(request_token._info)))
+        return zip(*sorted(request_token._info.items()))
 
 
 class IssueToken(command.ShowOne):
@@ -198,7 +197,7 @@ class IssueToken(command.ShowOne):
             # deployment system. When that happens, this will have to relay
             # scope information and IDs like we do for projects and domains.
             data['system'] = 'all'
-        return zip(*sorted(six.iteritems(data)))
+        return zip(*sorted(data.items()))
 
 
 class RevokeToken(command.Command):
diff --git a/openstackclient/identity/v3/trust.py b/openstackclient/identity/v3/trust.py
index 155063bb..cd3a65d0 100644
--- a/openstackclient/identity/v3/trust.py
+++ b/openstackclient/identity/v3/trust.py
@@ -20,7 +20,6 @@ from keystoneclient import exceptions as identity_exc
 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
@@ -136,7 +135,7 @@ class CreateTrust(command.ShowOne):
         msg = ' '.join(r['name'] for r in roles)
         trust._info['roles'] = msg
 
-        return zip(*sorted(six.iteritems(trust._info)))
+        return zip(*sorted(trust._info.items()))
 
 
 class DeleteTrust(command.Command):
@@ -213,4 +212,4 @@ class ShowTrust(command.ShowOne):
         msg = ' '.join(r['name'] for r in roles)
         trust._info['roles'] = msg
 
-        return zip(*sorted(six.iteritems(trust._info)))
+        return zip(*sorted(trust._info.items()))
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 5f4fb544..ca85c5d8 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -22,7 +22,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 _
 from openstackclient.identity import common
@@ -135,7 +134,7 @@ class CreateUser(command.ShowOne):
                 raise
 
         user._info.pop('links')
-        return zip(*sorted(six.iteritems(user._info)))
+        return zip(*sorted(user._info.items()))
 
 
 class DeleteUser(command.Command):
@@ -486,4 +485,4 @@ class ShowUser(command.ShowOne):
                                        user_str)
 
         user._info.pop('links')
-        return zip(*sorted(six.iteritems(user._info)))
+        return zip(*sorted(user._info.items()))