summaryrefslogtreecommitdiff
path: root/openstackclient/volume/v2/volume_backup.py
diff options
context:
space:
mode:
authorlihaijing <lihaijing@fiberhome.com>2017-07-07 11:48:48 +0800
committerAkihiro Motoki <amotoki@gmail.com>2020-01-09 18:41:29 +0900
commitd15bbada73f81136c966007d9c564dd6cfb2fd9c (patch)
tree63f42d709601bd2adbc0863adedd5dc732e1579d /openstackclient/volume/v2/volume_backup.py
parent4b575083b7979473b9c83eb01a520d5bacb88dc3 (diff)
downloadpython-openstackclient-d15bbada73f81136c966007d9c564dd6cfb2fd9c.tar.gz
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
Diffstat (limited to 'openstackclient/volume/v2/volume_backup.py')
-rw-r--r--openstackclient/volume/v2/volume_backup.py7
1 files changed, 3 insertions, 4 deletions
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()))