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

1 files changed, 3 insertions, 4 deletions

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):