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

15 files changed, 33 insertions, 48 deletions

diff --git a/openstackclient/volume/v1/qos_specs.py b/openstackclient/volume/v1/qos_specs.py
index 0b6a7fa0..79dff1c6 100644
--- a/openstackclient/volume/v1/qos_specs.py
+++ b/openstackclient/volume/v1/qos_specs.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 _
 
@@ -99,7 +98,7 @@ class CreateQos(command.ShowOne):
             {'properties':
              format_columns.DictColumn(qos_spec._info.pop('specs'))}
         )
-        return zip(*sorted(six.iteritems(qos_spec._info)))
+        return zip(*sorted(qos_spec._info.items()))
 
 
 class DeleteQos(command.Command):
@@ -273,7 +272,7 @@ class ShowQos(command.ShowOne):
             {'properties':
              format_columns.DictColumn(qos_spec._info.pop('specs'))})
 
-        return zip(*sorted(six.iteritems(qos_spec._info)))
+        return zip(*sorted(qos_spec._info.items()))
 
 
 class UnsetQos(command.Command):
diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index 36c7ef89..460bd85a 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -25,7 +25,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 _
 
@@ -253,7 +252,7 @@ class CreateVolume(command.ShowOne):
             volume._info, parsed_args.columns, {'display_name': 'name'}
         )
 
-        return zip(*sorted(six.iteritems(volume_info)))
+        return zip(*sorted(volume_info.items()))
 
 
 class DeleteVolume(command.Command):
@@ -614,7 +613,7 @@ class ShowVolume(command.ShowOne):
             volume._info, parsed_args.columns, {'display_name': 'name'}
         )
 
-        return zip(*sorted(six.iteritems(volume_info)))
+        return zip(*sorted(volume_info.items()))
 
 
 class UnsetVolume(command.Command):
diff --git a/openstackclient/volume/v1/volume_backup.py b/openstackclient/volume/v1/volume_backup.py
index 2daa23cb..1a83a3c0 100644
--- a/openstackclient/volume/v1/volume_backup.py
+++ b/openstackclient/volume/v1/volume_backup.py
@@ -23,7 +23,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 _
 
@@ -98,7 +97,7 @@ class CreateVolumeBackup(command.ShowOne):
         )
 
         backup._info.pop('links')
-        return zip(*sorted(six.iteritems(backup._info)))
+        return zip(*sorted(backup._info.items()))
 
 
 class DeleteVolumeBackup(command.Command):
@@ -263,4 +262,4 @@ class ShowVolumeBackup(command.ShowOne):
         backup = utils.find_resource(volume_client.backups,
                                      parsed_args.backup)
         backup._info.pop('links')
-        return zip(*sorted(six.iteritems(backup._info)))
+        return zip(*sorted(backup._info.items()))
diff --git a/openstackclient/volume/v1/volume_snapshot.py b/openstackclient/volume/v1/volume_snapshot.py
index 50f81771..966db48f 100644
--- a/openstackclient/volume/v1/volume_snapshot.py
+++ b/openstackclient/volume/v1/volume_snapshot.py
@@ -25,7 +25,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 _
 
@@ -110,7 +109,7 @@ class CreateVolumeSnapshot(command.ShowOne):
              format_columns.DictColumn(snapshot._info.pop('metadata'))}
         )
 
-        return zip(*sorted(six.iteritems(snapshot._info)))
+        return zip(*sorted(snapshot._info.items()))
 
 
 class DeleteVolumeSnapshot(command.Command):
@@ -342,7 +341,7 @@ class ShowVolumeSnapshot(command.ShowOne):
              format_columns.DictColumn(snapshot._info.pop('metadata'))}
         )
 
-        return zip(*sorted(six.iteritems(snapshot._info)))
+        return zip(*sorted(snapshot._info.items()))
 
 
 class UnsetVolumeSnapshot(command.Command):
diff --git a/openstackclient/volume/v1/volume_transfer_request.py b/openstackclient/volume/v1/volume_transfer_request.py
index 6f79658e..971b9ab5 100644
--- a/openstackclient/volume/v1/volume_transfer_request.py
+++ b/openstackclient/volume/v1/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 _
 
@@ -67,7 +66,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):
@@ -99,7 +98,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):
@@ -189,4 +188,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()))
diff --git a/openstackclient/volume/v1/volume_type.py b/openstackclient/volume/v1/volume_type.py
index e744e92f..4f015d13 100644
--- a/openstackclient/volume/v1/volume_type.py
+++ b/openstackclient/volume/v1/volume_type.py
@@ -24,7 +24,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 _
 
@@ -162,7 +161,7 @@ class CreateVolumeType(command.ShowOne):
                 {'encryption': format_columns.DictColumn(encryption._info)})
         volume_type._info.pop("os-volume-type-access:is_public", None)
 
-        return zip(*sorted(six.iteritems(volume_type._info)))
+        return zip(*sorted(volume_type._info.items()))
 
 
 class DeleteVolumeType(command.Command):
@@ -388,7 +387,7 @@ class ShowVolumeType(command.ShowOne):
                 LOG.error(_("Failed to display the encryption information "
                           "of this volume type: %s"), e)
         volume_type._info.pop("os-volume-type-access:is_public", None)
-        return zip(*sorted(six.iteritems(volume_type._info)))
+        return zip(*sorted(volume_type._info.items()))
 
 
 class UnsetVolumeType(command.Command):
diff --git a/openstackclient/volume/v2/backup_record.py b/openstackclient/volume/v2/backup_record.py
index f4918032..64ff4f67 100644
--- a/openstackclient/volume/v2/backup_record.py
+++ b/openstackclient/volume/v2/backup_record.py
@@ -18,7 +18,6 @@ import logging
 
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -51,7 +50,7 @@ class ExportBackupRecord(command.ShowOne):
             backup_data['Backup Service'] = backup_data.pop('backup_service')
             backup_data['Metadata'] = backup_data.pop('backup_url')
 
-        return zip(*sorted(six.iteritems(backup_data)))
+        return zip(*sorted(backup_data.items()))
 
 
 class ImportBackupRecord(command.ShowOne):
@@ -79,4 +78,4 @@ class ImportBackupRecord(command.ShowOne):
             parsed_args.backup_service,
             parsed_args.backup_metadata)
         backup_data.pop('links', None)
-        return zip(*sorted(six.iteritems(backup_data)))
+        return zip(*sorted(backup_data.items()))
diff --git a/openstackclient/volume/v2/consistency_group.py b/openstackclient/volume/v2/consistency_group.py
index 26dd8ffc..c50a1b5b 100644
--- a/openstackclient/volume/v2/consistency_group.py
+++ b/openstackclient/volume/v2/consistency_group.py
@@ -20,7 +20,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 _
 
@@ -161,7 +160,7 @@ class CreateConsistencyGroup(command.ShowOne):
                 )
             )
 
-        return zip(*sorted(six.iteritems(consistency_group._info)))
+        return zip(*sorted(consistency_group._info.items()))
 
 
 class DeleteConsistencyGroup(command.Command):
@@ -335,4 +334,4 @@ class ShowConsistencyGroup(command.ShowOne):
         consistency_group = utils.find_resource(
             volume_client.consistencygroups,
             parsed_args.consistency_group)
-        return zip(*sorted(six.iteritems(consistency_group._info)))
+        return zip(*sorted(consistency_group._info.items()))
diff --git a/openstackclient/volume/v2/consistency_group_snapshot.py b/openstackclient/volume/v2/consistency_group_snapshot.py
index 540deb01..3df66e69 100644
--- a/openstackclient/volume/v2/consistency_group_snapshot.py
+++ b/openstackclient/volume/v2/consistency_group_snapshot.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 CreateConsistencyGroupSnapshot(command.ShowOne):
             description=parsed_args.description,
         )
 
-        return zip(*sorted(six.iteritems(consistency_group_snapshot._info)))
+        return zip(*sorted(consistency_group_snapshot._info.items()))
 
 
 class DeleteConsistencyGroupSnapshot(command.Command):
@@ -187,4 +186,4 @@ class ShowConsistencyGroupSnapshot(command.ShowOne):
         consistency_group_snapshot = utils.find_resource(
             volume_client.cgsnapshots,
             parsed_args.consistency_group_snapshot)
-        return zip(*sorted(six.iteritems(consistency_group_snapshot._info)))
+        return zip(*sorted(consistency_group_snapshot._info.items()))
diff --git a/openstackclient/volume/v2/qos_specs.py b/openstackclient/volume/v2/qos_specs.py
index 3037d34a..e6e6b9f8 100644
--- a/openstackclient/volume/v2/qos_specs.py
+++ b/openstackclient/volume/v2/qos_specs.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 _
 
@@ -100,7 +99,7 @@ class CreateQos(command.ShowOne):
             {'properties':
              format_columns.DictColumn(qos_spec._info.pop('specs'))}
         )
-        return zip(*sorted(six.iteritems(qos_spec._info)))
+        return zip(*sorted(qos_spec._info.items()))
 
 
 class DeleteQos(command.Command):
@@ -275,7 +274,7 @@ class ShowQos(command.ShowOne):
             {'properties':
              format_columns.DictColumn(qos_spec._info.pop('specs'))})
 
-        return zip(*sorted(six.iteritems(qos_spec._info)))
+        return zip(*sorted(qos_spec._info.items()))
 
 
 class UnsetQos(command.Command):
diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py
index 17ccd3d3..4dde1340 100644
--- a/openstackclient/volume/v2/volume.py
+++ b/openstackclient/volume/v2/volume.py
@@ -25,7 +25,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 as identity_common
@@ -252,7 +251,7 @@ class CreateVolume(command.ShowOne):
             }
         )
         volume._info.pop("links", None)
-        return zip(*sorted(six.iteritems(volume._info)))
+        return zip(*sorted(volume._info.items()))
 
 
 class DeleteVolume(command.Command):
@@ -751,7 +750,7 @@ class ShowVolume(command.ShowOne):
 
         # Remove key links from being displayed
         volume._info.pop("links", None)
-        return zip(*sorted(six.iteritems(volume._info)))
+        return zip(*sorted(volume._info.items()))
 
 
 class UnsetVolume(command.Command):
diff --git a/openstackclient/volume/v2/volume_backup.py b/openstackclient/volume/v2/volume_backup.py
index 4d0d54c1..c336f6c9 100644
--- a/openstackclient/volume/v2/volume_backup.py
+++ b/openstackclient/volume/v2/volume_backup.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 _
 
@@ -120,7 +119,7 @@ class CreateVolumeBackup(command.ShowOne):
             snapshot_id=snapshot_id,
         )
         backup._info.pop("links", None)
-        return zip(*sorted(six.iteritems(backup._info)))
+        return zip(*sorted(backup._info.items()))
 
 
 class DeleteVolumeBackup(command.Command):
@@ -289,7 +288,7 @@ class RestoreVolumeBackup(command.ShowOne):
                                                  parsed_args.volume)
         backup = volume_client.restores.restore(backup.id,
                                                 destination_volume.id)
-        return zip(*sorted(six.iteritems(backup._info)))
+        return zip(*sorted(backup._info.items()))
 
 
 class SetVolumeBackup(command.Command):
@@ -371,4 +370,4 @@ class ShowVolumeBackup(command.ShowOne):
         backup = utils.find_resource(volume_client.backups,
                                      parsed_args.backup)
         backup._info.pop("links", None)
-        return zip(*sorted(six.iteritems(backup._info)))
+        return zip(*sorted(backup._info.items()))
diff --git a/openstackclient/volume/v2/volume_snapshot.py b/openstackclient/volume/v2/volume_snapshot.py
index 2b26ae32..edacf683 100644
--- a/openstackclient/volume/v2/volume_snapshot.py
+++ b/openstackclient/volume/v2/volume_snapshot.py
@@ -24,7 +24,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 as identity_common
@@ -140,7 +139,7 @@ class CreateVolumeSnapshot(command.ShowOne):
             {'properties':
              format_columns.DictColumn(snapshot._info.pop('metadata'))}
         )
-        return zip(*sorted(six.iteritems(snapshot._info)))
+        return zip(*sorted(snapshot._info.items()))
 
 
 class DeleteVolumeSnapshot(command.Command):
@@ -426,7 +425,7 @@ class ShowVolumeSnapshot(command.ShowOne):
             {'properties':
              format_columns.DictColumn(snapshot._info.pop('metadata'))}
         )
-        return zip(*sorted(six.iteritems(snapshot._info)))
+        return zip(*sorted(snapshot._info.items()))
 
 
 class UnsetVolumeSnapshot(command.Command):
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()))
diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py
index 54b1f497..483e6dd3 100644
--- a/openstackclient/volume/v2/volume_type.py
+++ b/openstackclient/volume/v2/volume_type.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 _
 from openstackclient.identity import common as identity_common
@@ -235,7 +234,7 @@ class CreateVolumeType(command.ShowOne):
                 {'encryption': format_columns.DictColumn(encryption._info)})
         volume_type._info.pop("os-volume-type-access:is_public", None)
 
-        return zip(*sorted(six.iteritems(volume_type._info)))
+        return zip(*sorted(volume_type._info.items()))
 
 
 class DeleteVolumeType(command.Command):
@@ -553,7 +552,7 @@ class ShowVolumeType(command.ShowOne):
                 LOG.error(_("Failed to display the encryption information "
                           "of this volume type: %s"), e)
         volume_type._info.pop("os-volume-type-access:is_public", None)
-        return zip(*sorted(six.iteritems(volume_type._info)))
+        return zip(*sorted(volume_type._info.items()))
 
 
 class UnsetVolumeType(command.Command):