summaryrefslogtreecommitdiff
path: root/openstackclient/volume/v2/volume.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.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.py')
-rw-r--r--openstackclient/volume/v2/volume.py5
1 files changed, 2 insertions, 3 deletions
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):