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/volume/v2/volume_transfer_request.py b/openstackclient/volume/v2/volume_transfer_request.py
index 4c4741bc..2a1ace1f 100644
--- a/openstackclient/volume/v2/volume_transfer_request.py
+++ b/openstackclient/volume/v2/volume_transfer_request.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 _
 
@@ -64,7 +63,7 @@ class AcceptTransferRequest(command.ShowOne):
         )
         transfer_accept._info.pop("links", None)
 
-        return zip(*sorted(six.iteritems(transfer_accept._info)))
+        return zip(*sorted(transfer_accept._info.items()))
 
 
 class CreateTransferRequest(command.ShowOne):
@@ -96,7 +95,7 @@ class CreateTransferRequest(command.ShowOne):
         )
         volume_transfer_request._info.pop("links", None)
 
-        return zip(*sorted(six.iteritems(volume_transfer_request._info)))
+        return zip(*sorted(volume_transfer_request._info.items()))
 
 
 class DeleteTransferRequest(command.Command):
@@ -186,4 +185,4 @@ class ShowTransferRequest(command.ShowOne):
         )
         volume_transfer_request._info.pop("links", None)
 
-        return zip(*sorted(six.iteritems(volume_transfer_request._info)))
+        return zip(*sorted(volume_transfer_request._info.items()))