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, 2 insertions, 3 deletions

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