From: Angus Lees <gus@inodes.org>
Date: Thu, 21 Aug 2014 04:08:07 +0000 (+1000)
Subject: Hyper-V: Remove useless use of "else" clause on for loop
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=105ce10838ccf20a41ece32997e0cf8ffb1de483;p=openstack-build%2Fneutron-build.git

Hyper-V: Remove useless use of "else" clause on for loop

"else" on for loops is only important if the loop contains a "break"
statement.  Without a "break", the else block is _always_ executed and
it is clearer just to omit "else".

This change also enables the corresponding pylint warning, now that the
only offending case has been fixed.

Change-Id: Ibe8761cb40a7d2d564aa718d62c9f383b5ad711e
---

diff --git a/.pylintrc b/.pylintrc
index c738c547c..ca0b297a6 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -68,7 +68,6 @@ disable=
  unused-argument,
  unused-import,
  unused-variable,
- useless-else-on-loop,
 # "C" Coding convention violations
  bad-continuation,
  invalid-name,
diff --git a/neutron/plugins/ml2/drivers/mech_hyperv.py b/neutron/plugins/ml2/drivers/mech_hyperv.py
index b384d3425..ec33c432c 100644
--- a/neutron/plugins/ml2/drivers/mech_hyperv.py
+++ b/neutron/plugins/ml2/drivers/mech_hyperv.py
@@ -51,7 +51,4 @@ class HypervMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
             for pattern in mappings:
                 if re.match(pattern, segment[api.PHYSICAL_NETWORK]):
                     return True
-            else:
-                return False
-        else:
-            return False
+        return False