diff options
| author | lihaijing <lihaijing@fiberhome.com> | 2017-07-07 11:48:48 +0800 |
|---|---|---|
| committer | Akihiro Motoki <amotoki@gmail.com> | 2020-01-09 18:41:29 +0900 |
| commit | d15bbada73f81136c966007d9c564dd6cfb2fd9c (patch) | |
| tree | 63f42d709601bd2adbc0863adedd5dc732e1579d /openstackclient/object | |
| parent | 4b575083b7979473b9c83eb01a520d5bacb88dc3 (diff) | |
| download | python-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/object')
| -rw-r--r-- | openstackclient/object/v1/account.py | 3 | ||||
| -rw-r--r-- | openstackclient/object/v1/container.py | 3 | ||||
| -rw-r--r-- | openstackclient/object/v1/object.py | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py index 95be8132..d6bc9fd7 100644 --- a/openstackclient/object/v1/account.py +++ b/openstackclient/object/v1/account.py @@ -16,7 +16,6 @@ from osc_lib.cli import format_columns from osc_lib.cli import parseractions from osc_lib.command import command -import six from openstackclient.i18n import _ @@ -50,7 +49,7 @@ class ShowAccount(command.ShowOne): if 'properties' in data: data['properties'] = format_columns.DictColumn( data.pop('properties')) - return zip(*sorted(six.iteritems(data))) + return zip(*sorted(data.items())) class UnsetAccount(command.Command): diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py index 02e8d277..47ca5bc1 100644 --- a/openstackclient/object/v1/container.py +++ b/openstackclient/object/v1/container.py @@ -21,7 +21,6 @@ from osc_lib.cli import format_columns from osc_lib.cli import parseractions from osc_lib.command import command from osc_lib import utils -import six from openstackclient.i18n import _ @@ -233,7 +232,7 @@ class ShowContainer(command.ShowOne): if 'properties' in data: data['properties'] = format_columns.DictColumn(data['properties']) - return zip(*sorted(six.iteritems(data))) + return zip(*sorted(data.items())) class UnsetContainer(command.Command): diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py index 3747e19e..01e537ee 100644 --- a/openstackclient/object/v1/object.py +++ b/openstackclient/object/v1/object.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 _ @@ -287,7 +286,7 @@ class ShowObject(command.ShowOne): if 'properties' in data: data['properties'] = format_columns.DictColumn(data['properties']) - return zip(*sorted(six.iteritems(data))) + return zip(*sorted(data.items())) class UnsetObject(command.Command): |