openstack
/
glance
Code Issues Proposed changes

Merge "Drop dict.iterkeys() for python3"

This commit is contained in:
Jenkins 2016-01-22 23:44:49 +00:00 committed by Gerrit Code Review
parent e2ad71f95c eb2e7c04fe
commit c0e2bce811
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glance/artifacts/domain/proxy.py
View File

@ -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__),

2
tools/colorizer.py
View File

@ -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()