From eb2e7c04fec2d4650add1b7fb4a9df970ffea962 Mon Sep 17 00:00:00 2001 From: Bo Wang Date: Wed, 20 Jan 2016 11:26:09 +0800 Subject: [PATCH] Drop dict.iterkeys() for python3 dict.iterkeys() has been removed in python3, replace it with dict.keys(). Don't use six.iterkeys(dict). ref: http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html Change-Id: Ifbb27c748f43155ea1f6b43b718516c3a348daf2 --- glance/artifacts/domain/proxy.py | 4 +--- tools/colorizer.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/glance/artifacts/domain/proxy.py b/glance/artifacts/domain/proxy.py index de4b096567..35591be5d3 100644 --- a/glance/artifacts/domain/proxy.py +++ b/glance/artifacts/domain/proxy.py @@ -14,8 +14,6 @@ import collections -import six - from glance.common import exception as exc from glance.domain import proxy as image_proxy @@ -42,7 +40,7 @@ class ArtifactHelper(image_proxy.Helper): if not hasattr(obj, 'metadata'): return super(ArtifactHelper, self).proxy(obj) extra_attrs = {} - for att_name in six.iterkeys(obj.metadata.attributes.all): + for att_name in obj.metadata.attributes.all.keys(): extra_attrs[att_name] = _proxy_artifact_property(att_name) new_proxy_class = type("%s(%s)" % (obj.metadata.type_name, self.proxy_class.__module__), diff --git a/tools/colorizer.py b/tools/colorizer.py index ad4f898386..66f8c8a3d7 100755 --- a/tools/colorizer.py +++ b/tools/colorizer.py @@ -271,7 +271,7 @@ class SubunitTestResult(testtools.TestResult): self.stopTestRun() def stopTestRun(self): - for cls in list(self.results.iterkeys()): + for cls in list(self.results.keys()): self.writeTestCase(cls) self.stream.writeln() self.writeSlowTests()