From 1f1f02aac629bf1aa0c4addae2b1e599ade52493 Mon Sep 17 00:00:00 2001 From: "ting.wang" Date: Sat, 16 Jan 2016 10:13:48 +0800 Subject: [PATCH] Replace six.iteritems(dict) with dict.items() Replacing dict.iteritems()/.itervalues() with six.iteritems(dict)/six.itervalues(dict) was preferred in the past but there was a discussion suggesting to avoid six for this. ref: http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html Change-Id: Id17494887e241b1f0e0195ab8817d07581f51a96 --- zaqar/common/utils.py | 4 ++-- zaqar/tests/base.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/zaqar/common/utils.py b/zaqar/common/utils.py index 748c94bc1..8c605452c 100644 --- a/zaqar/common/utils.py +++ b/zaqar/common/utils.py @@ -36,7 +36,7 @@ def fields(d, names, pred=lambda x: True, """ return dict((key_transform(k), value_transform(v)) - for k, v in six.iteritems(d) + for k, v in d.items() if k in names and pred(v)) @@ -62,7 +62,7 @@ def dict_to_conf(options): opts = [] - for k, v in six.iteritems(options): + for k, v in options.items(): opt_type = _pytype_to_cfgtype[type(v)] opts.append(opt_type(name=k, default=v)) diff --git a/zaqar/tests/base.py b/zaqar/tests/base.py index e31054eec..09d701a6a 100644 --- a/zaqar/tests/base.py +++ b/zaqar/tests/base.py @@ -18,7 +18,6 @@ import os import fixtures from oslo_config import cfg from oslo_log import log -import six import testtools from zaqar.common import configs @@ -100,7 +99,7 @@ class TestBase(testtools.TestCase): All overrides are automatically cleared at the end of the current test by the tearDown() method. """ - for k, v in six.iteritems(kw): + for k, v in kw.items(): self.conf.set_override(k, v, group, enforce_type=True) def _my_dir(self):