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

The "keys" method works on both Python 2 and 3, and the performance
impact should be negligible.

Change-Id: I4771797859666000921e4e38cc5de72a8c084ca0
Blueprint: neutron-python3

diff --git a/neutron/extensions/quotasv2.py b/neutron/extensions/quotasv2.py
index bddad4fe5b4776950f151c03658d1238129650c1..1055e92f48a4ea4e36f974149705fabdc9033925 100644 (file)
--- a/neutron/extensions/quotasv2.py
+++ b/neutron/extensions/quotasv2.py
@@ -48,7 +48,7 @@ class QuotaSetsController(wsgi.Controller):
         self._update_extended_attributes = True
 
     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[quota_resource] = {
                 'allow_post': False,

diff --git a/neutron/plugins/sriovnicagent/sriov_nic_agent.py b/neutron/plugins/sriovnicagent/sriov_nic_agent.py
index 9e3a928f5e233051012570b3a01b7fe752efa44c..24a54258d4c42339a02201ee0f8a4194ebcfe2ce 100644 (file)
--- a/neutron/plugins/sriovnicagent/sriov_nic_agent.py
+++ b/neutron/plugins/sriovnicagent/sriov_nic_agent.py
@@ -309,7 +309,7 @@ class SriovNicAgentConfigParser(object):
         exists in device mappings
         """
         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:
                 raise ValueError(_("Device name %(dev_name)s is missing from "
                                    "physical_device_mappings") % {'dev_name':