From 7b83eec5b814e8be1a70165db2f03c8d077b544e Mon Sep 17 00:00:00 2001 From: Lu lei Date: Tue, 23 Aug 2016 10:47:12 +0800 Subject: [PATCH] py3:Rmove six.iteritems/iterkeys in python-senlinclient MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、As mentioned in [1], we should avoid using six.iteritems/keys achieve iterators. We can use dict.items/keys 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 Change-Id: I75d12f56821666ebaec8350acba3a5fc29957f1e --- senlinclient/tests/unit/v1/fakes.py | 2 +- senlinclient/v1/action.py | 3 +-- senlinclient/v1/cluster.py | 3 +-- senlinclient/v1/cluster_policy.py | 3 +-- senlinclient/v1/event.py | 3 +-- senlinclient/v1/node.py | 3 +-- senlinclient/v1/policy_type.py | 5 ++--- senlinclient/v1/profile_type.py | 5 ++--- senlinclient/v1/receiver.py | 3 +-- 9 files changed, 11 insertions(+), 19 deletions(-) diff --git a/senlinclient/tests/unit/v1/fakes.py b/senlinclient/tests/unit/v1/fakes.py index 951594e6..46198974 100644 --- a/senlinclient/tests/unit/v1/fakes.py +++ b/senlinclient/tests/unit/v1/fakes.py @@ -141,7 +141,7 @@ class FakeResource(object): self._loaded = loaded def _add_details(self, info): - for (k, v) in six.iteritems(info): + for (k, v) in info.items(): setattr(self, k, v) def __repr__(self): diff --git a/senlinclient/v1/action.py b/senlinclient/v1/action.py index 379e137a..f5d7ed63 100644 --- a/senlinclient/v1/action.py +++ b/senlinclient/v1/action.py @@ -13,7 +13,6 @@ """Clustering v1 action implementations""" import logging -import six from openstack import exceptions as sdk_exc from osc_lib.command import command @@ -142,6 +141,6 @@ class ShowAction(command.ShowOne): 'depended_by': senlin_utils.list_formatter, } data = action.to_dict() - columns = sorted(list(six.iterkeys(data))) + columns = sorted(data.keys()) return columns, utils.get_dict_properties(data, columns, formatters=formatters) diff --git a/senlinclient/v1/cluster.py b/senlinclient/v1/cluster.py index d612f256..3b80b96a 100644 --- a/senlinclient/v1/cluster.py +++ b/senlinclient/v1/cluster.py @@ -13,7 +13,6 @@ """Clustering v1 cluster action implementations""" import logging -import six import sys from openstack import exceptions as sdk_exc @@ -136,7 +135,7 @@ def _show_cluster(senlin_client, cluster_id): 'node_ids': senlin_utils.list_formatter } data = cluster.to_dict() - columns = sorted(list(six.iterkeys(data))) + columns = sorted(data.keys()) return columns, utils.get_dict_properties(data, columns, formatters=formatters) diff --git a/senlinclient/v1/cluster_policy.py b/senlinclient/v1/cluster_policy.py index aed724b2..b950526f 100644 --- a/senlinclient/v1/cluster_policy.py +++ b/senlinclient/v1/cluster_policy.py @@ -13,7 +13,6 @@ """Clustering v1 cluster policy action implementations""" import logging -import six from osc_lib.command import command from osc_lib import utils @@ -113,7 +112,7 @@ class ClusterPolicyShow(command.ShowOne): policy = senlin_client.get_cluster_policy(parsed_args.policy, parsed_args.cluster) data = policy.to_dict() - columns = sorted(list(six.iterkeys(data))) + columns = sorted(data.keys()) return columns, utils.get_dict_properties(data, columns) diff --git a/senlinclient/v1/event.py b/senlinclient/v1/event.py index 1fa17678..33259287 100644 --- a/senlinclient/v1/event.py +++ b/senlinclient/v1/event.py @@ -13,7 +13,6 @@ """Clustering v1 event action implementations""" import logging -import six from openstack import exceptions as sdk_exc from osc_lib.command import command @@ -128,5 +127,5 @@ class ShowEvent(command.ShowOne): raise exc.CommandError(_("Event not found: %s") % parsed_args.event) data = event.to_dict() - columns = sorted(list(six.iterkeys(data))) + columns = sorted(data.keys()) return columns, utils.get_dict_properties(data, columns) diff --git a/senlinclient/v1/node.py b/senlinclient/v1/node.py index 6a5e158e..9cbe01d9 100644 --- a/senlinclient/v1/node.py +++ b/senlinclient/v1/node.py @@ -13,7 +13,6 @@ """Clustering v1 node action implementations""" import logging -import six import sys from openstack import exceptions as sdk_exc @@ -160,7 +159,7 @@ def _show_node(senlin_client, node_id, show_details=False): if show_details: formatters['details'] = senlin_utils.nested_dict_formatter( list(data['details'].keys()), ['property', 'value']) - columns = sorted(list(six.iterkeys(data))) + columns = sorted(data.keys()) return columns, utils.get_dict_properties(data, columns, formatters=formatters) diff --git a/senlinclient/v1/policy_type.py b/senlinclient/v1/policy_type.py index 7dd40b9c..d6ad86fe 100644 --- a/senlinclient/v1/policy_type.py +++ b/senlinclient/v1/policy_type.py @@ -13,7 +13,6 @@ """Clustering v1 policy type action implementations""" import logging -import six from openstack import exceptions as sdk_exc from osc_lib.command import command @@ -65,6 +64,6 @@ class PolicyTypeShow(format_utils.YamlFormat): raise exc.CommandError(_('Policy Type not found: %s') % parsed_args.type_name) data = res.to_dict() - rows = list(six.itervalues(data)) - columns = list(six.iterkeys(data)) + rows = data.values() + columns = data.keys() return columns, rows diff --git a/senlinclient/v1/profile_type.py b/senlinclient/v1/profile_type.py index 8f9ba0af..43983401 100644 --- a/senlinclient/v1/profile_type.py +++ b/senlinclient/v1/profile_type.py @@ -13,7 +13,6 @@ """Clustering v1 profile type action implementations""" import logging -import six from openstack import exceptions as sdk_exc from osc_lib.command import command @@ -64,6 +63,6 @@ class ProfileTypeShow(format_utils.YamlFormat): raise exc.CommandError(_('Profile Type not found: %s') % parsed_args.type_name) data = res.to_dict() - rows = list(six.itervalues(data)) - columns = list(six.iterkeys(data)) + rows = data.values() + columns = data.keys() return columns, rows diff --git a/senlinclient/v1/receiver.py b/senlinclient/v1/receiver.py index fda140be..205c0dcf 100644 --- a/senlinclient/v1/receiver.py +++ b/senlinclient/v1/receiver.py @@ -13,7 +13,6 @@ """Clustering v1 receiver action implementations""" import logging -import six import sys from openstack import exceptions as sdk_exc @@ -141,7 +140,7 @@ def _show_receiver(senlin_client, receiver_id): 'channel': senlin_utils.json_formatter, } data = receiver.to_dict() - columns = sorted(list(six.iterkeys(data))) + columns = sorted(data.keys()) return columns, utils.get_dict_properties(data, columns, formatters=formatters)