diff --git a/.pylintrc b/.pylintrc index bb9c6f7f..37ff2230 100644 --- a/.pylintrc +++ b/.pylintrc @@ -37,6 +37,9 @@ disable= too-many-locals, too-many-public-methods, too-many-return-statements, + inconsistent-return-statements, + catching-non-exception, + using-constant-test, too-many-statements [BASIC] diff --git a/lower-constraints.txt b/lower-constraints.txt index 5750728f..30fd716d 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -31,7 +31,7 @@ pbr==2.0.0 pep8==1.5.7 pyflakes==0.8.1 Pygments==2.2.0 -pylint==1.4.5 +pylint==1.9.2 python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 diff --git a/ovsdbapp/backend/ovs_idl/windows/utils.py b/ovsdbapp/backend/ovs_idl/windows/utils.py index 7611c44e..da850e8a 100644 --- a/ovsdbapp/backend/ovs_idl/windows/utils.py +++ b/ovsdbapp/backend/ovs_idl/windows/utils.py @@ -39,5 +39,4 @@ def avoid_blocking_call(f, *args, **kwargs): # loop greenlet. if eventlet.getcurrent().parent: return tpool.execute(f, *args, **kwargs) - else: - return f(*args, **kwargs) + return f(*args, **kwargs) diff --git a/ovsdbapp/utils.py b/ovsdbapp/utils.py index 0ab81e99..8c708d2f 100644 --- a/ovsdbapp/utils.py +++ b/ovsdbapp/utils.py @@ -10,9 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -import netaddr import uuid +import netaddr + # NOTE(twilson) Clearly these are silly, but they are good enough for now # I'm happy for someone to replace them with better parsing diff --git a/test-requirements.txt b/test-requirements.txt index 0c759a96..eb882ca6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD openstackdocstheme>=1.18.1 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0 -pylint==1.4.5 # GPLv2 +pylint==1.9.2 # GPLv2 stestr>=2.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT