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):