From 1f4fa2b6e4d83a3734ae8dc214f69305dc116acb Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 10 Sep 2015 12:08:54 +0200 Subject: [PATCH] py3: Don't use iteritems() and iterkeys() methods * Replace dict.iteritems() and six.iteritems(dict) with dict.items() * Replace "for key in dict.iterkeys():" with "for key in dict:" For readability, it was decided to use the dict.items() even on Python 2, instead of six.iteritems(dict). The performance overhead (creation of a temporary list) is negligible. Change-Id: I56bcea5302c07448b527784731b40ebe8642433e --- fuelclient/cli/formatting.py | 2 +- fuelclient/cli/parser.py | 2 +- fuelclient/fuelclient_settings.py | 2 +- fuelclient/tests/unit/common/test_serializers.py | 5 ++--- fuelclient/v1/environment.py | 4 +--- fuelclient/v1/node.py | 6 ++---- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/fuelclient/cli/formatting.py b/fuelclient/cli/formatting.py index 2cc802f..aac8bd3 100644 --- a/fuelclient/cli/formatting.py +++ b/fuelclient/cli/formatting.py @@ -61,7 +61,7 @@ def format_table(data, acceptable_keys=None, column_to_join=None): ) row_template = u' | '.join( u"{{{0}:{1}}}".format(idx, width) - for idx, width in column_widths.iteritems() + for idx, width in column_widths.items() ) return u'\n'.join( diff --git a/fuelclient/cli/parser.py b/fuelclient/cli/parser.py index 8adf911..4527408 100644 --- a/fuelclient/cli/parser.py +++ b/fuelclient/cli/parser.py @@ -112,7 +112,7 @@ class Parser: self.add_serializers_args() def generate_actions(self): - for action, action_object in actions.iteritems(): + for action, action_object in actions.items(): action_parser = self.subparsers.add_parser( action, prog="fuel {0}".format(action), diff --git a/fuelclient/fuelclient_settings.py b/fuelclient/fuelclient_settings.py index 7d86b64..d1ea813 100644 --- a/fuelclient/fuelclient_settings.py +++ b/fuelclient/fuelclient_settings.py @@ -92,7 +92,7 @@ class FuelClientSettings(object): ) def _update_from_env(self): - for k in six.iterkeys(self.config): + for k in self.config: if k in os.environ: self.config[k] = os.environ[k] diff --git a/fuelclient/tests/unit/common/test_serializers.py b/fuelclient/tests/unit/common/test_serializers.py index adef1f1..64d73b5 100644 --- a/fuelclient/tests/unit/common/test_serializers.py +++ b/fuelclient/tests/unit/common/test_serializers.py @@ -16,7 +16,6 @@ import json import mock -import six import yaml from fuelclient.cli.serializers import Serializer @@ -46,13 +45,13 @@ class TestSerializers(base.UnitTestCase): def test_serialize(self): deserializers = {'json': json.loads, 'yaml': yaml.load} - for format, deserialize in six.iteritems(deserializers): + for format, deserialize in deserializers.items(): serialized = Serializer(format).serialize(self.DATA) self.assertEqual(self.DATA, deserialize(serialized)) def test_deserialize(self): serializers = {'json': json.dumps, 'yaml': yaml.safe_dump} - for format, serialize in six.iteritems(serializers): + for format, serialize in serializers.items(): serialized = serialize(self.DATA) deserialized = Serializer(format).deserialize(serialized) self.assertEqual(self.DATA, deserialized) diff --git a/fuelclient/v1/environment.py b/fuelclient/v1/environment.py index a7174d1..2326f2c 100644 --- a/fuelclient/v1/environment.py +++ b/fuelclient/v1/environment.py @@ -12,8 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six - from fuelclient.cli import error from fuelclient import objects from fuelclient.v1 import base_v1 @@ -49,7 +47,7 @@ class EnvironmentClient(base_v1.BaseV1Client): allowed_changes = {} extra_args = {} - for i in six.iterkeys(kwargs): + for i in kwargs: if i in self._updatable_attributes: allowed_changes[i] = kwargs[i] else: diff --git a/fuelclient/v1/node.py b/fuelclient/v1/node.py index 652a861..c68868a 100644 --- a/fuelclient/v1/node.py +++ b/fuelclient/v1/node.py @@ -16,8 +16,6 @@ from collections import namedtuple import copy from functools import partial -import six - from fuelclient.cli import error from fuelclient import objects from fuelclient.v1 import base_v1 @@ -62,7 +60,7 @@ class NodeClient(base_v1.BaseV1Client): def update(self, node_id, **updated_attributes): node = self._entity_wrapper(obj_id=node_id) - for attr in six.iterkeys(updated_attributes): + for attr in updated_attributes: if attr not in self._updatable_attributes: msg = 'Only {0} are updatable'.format( self._updatable_attributes) @@ -86,7 +84,7 @@ class NodeClient(base_v1.BaseV1Client): result = filter(lambda node: str(node['id']) in node_ids, result) for node in result: - for key, value in six.iteritems(node.get('labels', [])): + for key, value in node.get('labels', []).items(): labels.append({ 'node_id': node.get('id'), 'label_name': key,