From a8619e9bd1247e8ec494c456aee9ee7163231f62 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Mon, 15 Jun 2015 15:07:28 +0000 Subject: [PATCH] Python 3: use dict.values instead of dict.itervalues This works with both Python 2 and 3, and should not have any performance impact. Change-Id: I2a14945c60de513b91c6f022ff5dcc503ce2a8ad Blueprint: neutron-python3 --- neutron/api/extensions.py | 6 +++--- neutron/common/utils.py | 2 +- .../plugins/linuxbridge/agent/linuxbridge_neutron_agent.py | 2 +- neutron/plugins/ml2/drivers/type_vlan.py | 2 +- neutron/plugins/sriovnicagent/eswitch_manager.py | 2 +- neutron/plugins/sriovnicagent/sriov_nic_agent.py | 2 +- neutron/tests/tempest/common/isolated_creds.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/neutron/api/extensions.py b/neutron/api/extensions.py index f6b4601ba21..905d8ce81a9 100644 --- a/neutron/api/extensions.py +++ b/neutron/api/extensions.py @@ -411,7 +411,7 @@ class ExtensionManager(object): resources = [] resources.append(ResourceExtension('extensions', ExtensionController(self))) - for ext in self.extensions.itervalues(): + for ext in self.extensions.values(): try: resources.extend(ext.get_resources()) except AttributeError: @@ -423,7 +423,7 @@ class ExtensionManager(object): def get_actions(self): """Returns a list of ActionExtension objects.""" actions = [] - for ext in self.extensions.itervalues(): + for ext in self.extensions.values(): try: actions.extend(ext.get_actions()) except AttributeError: @@ -435,7 +435,7 @@ class ExtensionManager(object): def get_request_extensions(self): """Returns a list of RequestExtension objects.""" request_exts = [] - for ext in self.extensions.itervalues(): + for ext in self.extensions.values(): try: request_exts.extend(ext.get_request_extensions()) except AttributeError: diff --git a/neutron/common/utils.py b/neutron/common/utils.py index 53308908b30..f4b286015a4 100644 --- a/neutron/common/utils.py +++ b/neutron/common/utils.py @@ -210,7 +210,7 @@ def parse_mappings(mapping_list, unique_values=True): if key in mappings: raise ValueError(_("Key %(key)s in mapping: '%(mapping)s' not " "unique") % {'key': key, 'mapping': mapping}) - if unique_values and value in mappings.itervalues(): + if unique_values and value in mappings.values(): raise ValueError(_("Value %(value)s in mapping: '%(mapping)s' " "not unique") % {'value': value, 'mapping': mapping}) diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py index 2cf116619e2..aba3dee0bc0 100644 --- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -436,7 +436,7 @@ class LinuxBridgeManager(object): self.delete_vxlan(interface) continue - for physical_interface in self.interface_mappings.itervalues(): + for physical_interface in self.interface_mappings.values(): if (interface.startswith(physical_interface)): ips, gateway = self.get_interface_details(bridge_name) if ips: diff --git a/neutron/plugins/ml2/drivers/type_vlan.py b/neutron/plugins/ml2/drivers/type_vlan.py index 451e80187ae..a8280a46053 100644 --- a/neutron/plugins/ml2/drivers/type_vlan.py +++ b/neutron/plugins/ml2/drivers/type_vlan.py @@ -146,7 +146,7 @@ class VlanTypeDriver(helpers.SegmentTypeDriver): # remove from table unallocated vlans for any unconfigured # physical networks - for allocs in allocations.itervalues(): + for allocs in allocations.values(): for alloc in allocs: if not alloc.allocated: LOG.debug("Removing vlan %(vlan_id)s on physical " diff --git a/neutron/plugins/sriovnicagent/eswitch_manager.py b/neutron/plugins/sriovnicagent/eswitch_manager.py index 760a0e52ca4..5d80576a7c0 100644 --- a/neutron/plugins/sriovnicagent/eswitch_manager.py +++ b/neutron/plugins/sriovnicagent/eswitch_manager.py @@ -130,7 +130,7 @@ class EmbSwitch(object): """ vf_list = [] assigned_macs = [] - for vf_index in self.pci_slot_map.itervalues(): + for vf_index in self.pci_slot_map.values(): if not PciOsWrapper.is_assigned_vf(self.dev_name, vf_index): continue vf_list.append(vf_index) diff --git a/neutron/plugins/sriovnicagent/sriov_nic_agent.py b/neutron/plugins/sriovnicagent/sriov_nic_agent.py index 7bb92c063f9..9e3a928f5e2 100644 --- a/neutron/plugins/sriovnicagent/sriov_nic_agent.py +++ b/neutron/plugins/sriovnicagent/sriov_nic_agent.py @@ -308,7 +308,7 @@ class SriovNicAgentConfigParser(object): Validate that network_device in excluded_device exists in device mappings """ - dev_net_set = set(self.device_mappings.itervalues()) + dev_net_set = set(self.device_mappings.values()) for dev_name in self.exclude_devices.iterkeys(): if dev_name not in dev_net_set: raise ValueError(_("Device name %(dev_name)s is missing from " diff --git a/neutron/tests/tempest/common/isolated_creds.py b/neutron/tests/tempest/common/isolated_creds.py index b4de93b6271..5da24a92264 100644 --- a/neutron/tests/tempest/common/isolated_creds.py +++ b/neutron/tests/tempest/common/isolated_creds.py @@ -369,7 +369,7 @@ class IsolatedCreds(cred_provider.CredentialProvider): if not self.isolated_creds: return self._clear_isolated_net_resources() - for creds in self.isolated_creds.itervalues(): + for creds in self.isolated_creds.values(): try: self._delete_user(creds.user_id) except lib_exc.NotFound: