summaryrefslogtreecommitdiff
path: root/openstackclient/tests/unit/common
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/tests/unit/common
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/tests/unit/common')
-rw-r--r--openstackclient/tests/unit/common/test_availability_zone.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/openstackclient/tests/unit/common/test_availability_zone.py b/openstackclient/tests/unit/common/test_availability_zone.py
index 6c7adc43..49e5904d 100644
--- a/openstackclient/tests/unit/common/test_availability_zone.py
+++ b/openstackclient/tests/unit/common/test_availability_zone.py
@@ -13,8 +13,6 @@
import mock
-import six
-
from openstackclient.common import availability_zone
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import fakes
@@ -31,8 +29,8 @@ def _build_compute_az_datalist(compute_az, long_datalist=False):
'available',
)
else:
- for host, services in six.iteritems(compute_az.hosts):
- for service, state in six.iteritems(services):
+ for host, services in compute_az.hosts.items():
+ for service, state in services.items():
datalist += (
compute_az.zoneName,
'available',