summaryrefslogtreecommitdiff
path: root/openstackclient/common/availability_zone.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/common/availability_zone.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/common/availability_zone.py')
-rw-r--r--openstackclient/common/availability_zone.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/openstackclient/common/availability_zone.py b/openstackclient/common/availability_zone.py
index b2385ef7..3b2fa848 100644
--- a/openstackclient/common/availability_zone.py
+++ b/openstackclient/common/availability_zone.py
@@ -19,7 +19,6 @@ import logging
from novaclient import exceptions as nova_exceptions
from osc_lib.command import command
from osc_lib import utils
-import six
from openstackclient.i18n import _
@@ -47,11 +46,11 @@ def _xform_compute_availability_zone(az, include_extra):
return result
if hasattr(az, 'hosts') and az.hosts:
- for host, services in six.iteritems(az.hosts):
+ for host, services in az.hosts.items():
host_info = copy.deepcopy(zone_info)
host_info['host_name'] = host
- for svc, state in six.iteritems(services):
+ for svc, state in services.items():
info = copy.deepcopy(host_info)
info['service_name'] = svc
info['service_status'] = '%s %s %s' % (