From b8e483bb60e9bba61c1bb2610ad96b9756834998 Mon Sep 17 00:00:00 2001 From: yanghuichan Date: Fri, 4 Aug 2017 15:25:51 +0800 Subject: [PATCH] Replace dict.itervalues() with dict.values() 1.As mentioned in [1], we should avoid using six.itervalues to achieve iterators. We can use dict.values instead, as it will return iterators in PY3 as well. And dict.values will more readable. 2.In py2, the performance about list should be negligible, see the link [2]. [1] https://wiki.openstack.org/wiki/Python3#Common_patterns [2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html Change-Id: I27d3b04df19b964fe83e30ee383fcc1399dae3c3 --- firstapp/samples/openstacksdk/getting_started.py | 2 +- firstapp/samples/openstacksdk/introduction.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firstapp/samples/openstacksdk/getting_started.py b/firstapp/samples/openstacksdk/getting_started.py index 36e582bd1..e6146c32a 100644 --- a/firstapp/samples/openstacksdk/getting_started.py +++ b/firstapp/samples/openstacksdk/getting_started.py @@ -150,7 +150,7 @@ for instance in conn.compute.servers(): # step-13 print('Checking if Floating IP is already assigned to testing_instance...') testing_instance_floating_ip = None -for values in testing_instance.addresses.itervalues(): +for values in testing_instance.addresses.values(): for address in values: if address['OS-EXT-IPS:type'] == 'floating': testing_instance_floating_ip = conn.network.find_ip(address['addr']) diff --git a/firstapp/samples/openstacksdk/introduction.py b/firstapp/samples/openstacksdk/introduction.py index 10a63ca20..72d78fd45 100644 --- a/firstapp/samples/openstacksdk/introduction.py +++ b/firstapp/samples/openstacksdk/introduction.py @@ -165,7 +165,7 @@ instance_controller_1 = conn.compute.get_server(instance_controller_1) print('Application will be deployed to http://%s' % controller_instance_floating_ip.floating_ip_address) # step-12 -for values in instance_controller_1.addresses.itervalues(): +for values in instance_controller_1.addresses.values(): for address in values: if address['OS-EXT-IPS:type'] == 'fixed': ip_controller = address['addr'] @@ -217,7 +217,7 @@ instance_worker_1 = conn.compute.get_server(instance_worker_1) print('The worker will be available for SSH at %s' % worker_instance_floating_ip.floating_ip_address) # step-13 -for values in instance_worker_1.addresses.itervalues(): +for values in instance_worker_1.addresses.values(): for address in values: if address['OS-EXT-IPS:type'] == 'floating': ip_instance_worker_1 = address['addr']