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/common/configuration.py | |
| 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/common/configuration.py')
| -rw-r--r-- | openstackclient/common/configuration.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/openstackclient/common/configuration.py b/openstackclient/common/configuration.py index 53b30d5f..49ef0e05 100644 --- a/openstackclient/common/configuration.py +++ b/openstackclient/common/configuration.py @@ -15,7 +15,6 @@ from keystoneauth1.loading import base from osc_lib.command import command -import six from openstackclient.i18n import _ @@ -59,9 +58,9 @@ class ShowConfiguration(command.ShowOne): if o.secret ] - for key, value in six.iteritems(info.pop('auth', {})): + for key, value in info.pop('auth', {}).items(): if parsed_args.mask and key.lower() in secret_opts: value = REDACTED info['auth.' + key] = value - return zip(*sorted(six.iteritems(info))) + return zip(*sorted(info.items())) |