From 7c07c263b2a878a3e46d33b0401cf40ede6daf99 Mon Sep 17 00:00:00 2001
From: Angus Lees <gus@inodes.org>
Date: Tue, 21 Oct 2014 15:20:28 +1100
Subject: [PATCH] Enable assignment-from-no-return pylint check

The @versioning.versioned decorator used (only) in
plugins.vmware.nsxlib.router completely confuses this check, so add a
file-local pylint disable.

Change-Id: I2a79a643a982f49faaf22b88764cb170ef89ce21
---
 .pylintrc                               | 1 -
 neutron/plugins/vmware/nsxlib/router.py | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pylintrc b/.pylintrc
index c738c547c1..713494c103 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -19,7 +19,6 @@ disable=
  locally-disabled,
 # "E" Error for important programming issues (likely bugs)
  access-member-before-definition,
- assignment-from-no-return,
  bad-except-order,
  bad-super-call,
  maybe-no-member,
diff --git a/neutron/plugins/vmware/nsxlib/router.py b/neutron/plugins/vmware/nsxlib/router.py
index 254b4b6a51..2ef5245ab5 100644
--- a/neutron/plugins/vmware/nsxlib/router.py
+++ b/neutron/plugins/vmware/nsxlib/router.py
@@ -26,6 +26,10 @@ from neutron.plugins.vmware import nsxlib
 from neutron.plugins.vmware.nsxlib import switch
 from neutron.plugins.vmware.nsxlib import versioning
 
+# @versioning.versioned decorator makes the apparent function body
+# totally unrelated to the real function.  This confuses pylint :(
+# pylint: disable=assignment-from-no-return
+
 HTTP_GET = "GET"
 HTTP_POST = "POST"
 HTTP_DELETE = "DELETE"