From c6e22292bfd73f6ca9f6ad1d398f6efa7c7f403f Mon Sep 17 00:00:00 2001 From: Mark McClain Date: Wed, 11 Jun 2014 21:23:53 -0400 Subject: [PATCH] enable F812 check for flake8 The change removes the shadowed variable in list comprehensions and enables the F812 check Change-Id: If7b4d6f198795565fe0d8e7524b73555e310cd14 Partial-Bug: 1329017 --- neutron/plugins/cisco/db/l3/device_handling_db.py | 4 ++-- neutron/plugins/sriovnicagent/pci_lib.py | 3 +-- neutron/plugins/vmware/common/sync.py | 2 +- neutron/services/vpn/device_drivers/ipsec.py | 4 +--- tox.ini | 4 ++-- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/neutron/plugins/cisco/db/l3/device_handling_db.py b/neutron/plugins/cisco/db/l3/device_handling_db.py index 4e5deccd7..3e9469ba0 100644 --- a/neutron/plugins/cisco/db/l3/device_handling_db.py +++ b/neutron/plugins/cisco/db/l3/device_handling_db.py @@ -303,8 +303,8 @@ class DeviceHandlingMixin(object): agents = [hosting_device.cfg_agent for hosting_device in query if hosting_device.cfg_agent is not None] if active is not None: - agents = [agent for agent in agents if not - self.is_agent_down(agent['heartbeat_timestamp'])] + agents = [a for a in agents if not + self.is_agent_down(a['heartbeat_timestamp'])] return agents def auto_schedule_hosting_devices(self, context, agent_host): diff --git a/neutron/plugins/sriovnicagent/pci_lib.py b/neutron/plugins/sriovnicagent/pci_lib.py index 575d10c8d..065fd57ae 100644 --- a/neutron/plugins/sriovnicagent/pci_lib.py +++ b/neutron/plugins/sriovnicagent/pci_lib.py @@ -63,8 +63,7 @@ class PciDeviceIPWrapper(ip_lib.IPWrapper): vf_details = self._parse_vf_link_show(vf_line) if vf_details: vf_details_list.append(vf_details) - return [vf_details.get("MAC") for vf_details in - vf_details_list] + return [details.get("MAC") for details in vf_details_list] def get_vf_state(self, vf_index): """Get vf state {True/False} diff --git a/neutron/plugins/vmware/common/sync.py b/neutron/plugins/vmware/common/sync.py index c7fa6aeec..fc52ac655 100644 --- a/neutron/plugins/vmware/common/sync.py +++ b/neutron/plugins/vmware/common/sync.py @@ -329,7 +329,7 @@ class NsxSynchronizer(): for network in networks: lswitches = neutron_nsx_mappings.get(network['id'], []) - lswitches = [lswitch.get('data') for lswitch in lswitches] + lswitches = [lsw.get('data') for lsw in lswitches] self.synchronize_network(ctx, network, lswitches) def synchronize_router(self, context, neutron_router_data, diff --git a/neutron/services/vpn/device_drivers/ipsec.py b/neutron/services/vpn/device_drivers/ipsec.py index a3375fb0e..a7579e27d 100644 --- a/neutron/services/vpn/device_drivers/ipsec.py +++ b/neutron/services/vpn/device_drivers/ipsec.py @@ -692,9 +692,7 @@ class IPsecDriver(device_drivers.DeviceDriver): # Delete any IPSec processes running # VPN that do not have an associated router. - process_ids = [process_id - for process_id in self.processes - if process_id not in router_ids] + process_ids = [pid for pid in self.processes if pid not in router_ids] for process_id in process_ids: self.destroy_router(process_id) self.report_status(context) diff --git a/tox.ini b/tox.ini index 6e57c14ab..442a6348b 100644 --- a/tox.ini +++ b/tox.ini @@ -65,7 +65,7 @@ commands = python setup.py build_sphinx # E128 continuation line under-indented for visual indent # E129 visually indented line with same indent as next logical line # E265 block comment should start with ‘# ‘ -# F812 list comprehension redefines name from line +# H104 file contains nothing but comments # H237 module is removed in Python 3 # H305 imports not grouped correctly # H307 like imports should be grouped together @@ -74,7 +74,7 @@ commands = python setup.py build_sphinx # H405 multi line docstring summary not separated with an empty line # H904 Wrap long lines in parentheses instead of a backslash # TODO(marun) H404 multi line docstring should start with a summary -ignore = E125,E126,E128,E129,E265,F812,H237,H305,H307,H401,H402,H404,H405,H904 +ignore = E125,E126,E128,E129,E265,H237,H305,H307,H401,H402,H404,H405,H904 show-source = true builtins = _ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,.ropeproject,rally-scenarios -- 2.45.2