Merge "Python3: use dict.keys() instead of dict.iterkeys()"

This commit is contained in:
Jenkins 2015-06-19 19:10:34 +00:00 committed by Gerrit Code Review
commit f0a409f168
2 changed files with 2 additions and 2 deletions

View File

@ -48,7 +48,7 @@ class QuotaSetsController(wsgi.Controller):
self._update_extended_attributes = True self._update_extended_attributes = True
def _update_attributes(self): def _update_attributes(self):
for quota_resource in QUOTAS.resources.iterkeys(): for quota_resource in QUOTAS.resources.keys():
attr_dict = EXTENDED_ATTRIBUTES_2_0[RESOURCE_COLLECTION] attr_dict = EXTENDED_ATTRIBUTES_2_0[RESOURCE_COLLECTION]
attr_dict[quota_resource] = { attr_dict[quota_resource] = {
'allow_post': False, 'allow_post': False,

View File

@ -309,7 +309,7 @@ class SriovNicAgentConfigParser(object):
exists in device mappings exists in device mappings
""" """
dev_net_set = set(self.device_mappings.values()) dev_net_set = set(self.device_mappings.values())
for dev_name in self.exclude_devices.iterkeys(): for dev_name in self.exclude_devices.keys():
if dev_name not in dev_net_set: if dev_name not in dev_net_set:
raise ValueError(_("Device name %(dev_name)s is missing from " raise ValueError(_("Device name %(dev_name)s is missing from "
"physical_device_mappings") % {'dev_name': "physical_device_mappings") % {'dev_name':