From 3086de9ed64f432e3f28dea8a14322b754f1d32b Mon Sep 17 00:00:00 2001 From: houming-wang Date: Tue, 22 Dec 2015 10:08:52 -0500 Subject: [PATCH] Replace dict.iteritems() with dict.items() Replace dict.iteritems() which is no longer present in Python 3 with dict.items(). Do not use six.iteritems because discussion in mail list http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html Change-Id: I51ac7904f9194a6c9ed72c1cb0e7afdc535f6bd4 Partially-Implements: blueprint magnum-python3 --- magnum/api/attr_validator.py | 3 +-- magnum/tests/unit/db/test_magnum_service.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/magnum/api/attr_validator.py b/magnum/api/attr_validator.py index 63a15eb845..d1e64b478e 100644 --- a/magnum/api/attr_validator.py +++ b/magnum/api/attr_validator.py @@ -14,7 +14,6 @@ from glanceclient import exc as glance_exception from novaclient import exceptions as nova_exception -import six from magnum.api import utils as api_utils from magnum.common import clients @@ -87,7 +86,7 @@ def validate_os_resources(context, baymodel_id): baymodel = BayModel.get_by_uuid(context, baymodel_id) cli = clients.OpenStackClients(context) - for attr, validate_method in six.iteritems(validators): + for attr, validate_method in validators.items(): if attr in baymodel and baymodel[attr] is not None: validate_method(cli, baymodel[attr]) diff --git a/magnum/tests/unit/db/test_magnum_service.py b/magnum/tests/unit/db/test_magnum_service.py index b0cf71cc36..90ee86ce4c 100644 --- a/magnum/tests/unit/db/test_magnum_service.py +++ b/magnum/tests/unit/db/test_magnum_service.py @@ -87,7 +87,7 @@ class DbMagnumServiceTestCase(base.DbTestCase): res = self.dbapi.get_magnum_service_list(self.context) self.assertEqual(1, len(res)) res = res[0] - for k, v in fake_ms_params.iteritems(): + for k, v in fake_ms_params.items(): self.assertEqual(res[k], v) fake_ms_params['binary'] = 'FakeBin1' @@ -96,5 +96,5 @@ class DbMagnumServiceTestCase(base.DbTestCase): res = self.dbapi.get_magnum_service_list(self.context, disabled=True) self.assertEqual(1, len(res)) res = res[0] - for k, v in fake_ms_params.iteritems(): + for k, v in fake_ms_params.items(): self.assertEqual(res[k], v)