Update Python code and tox

+ Fix "E731 do not assign a lambda expression, use a def".
+ Do not prescribe explicit pep8 version anymore.
+ Prevent flake8 from examining contents of .tox directory

Change-Id: I78d061892f125683edfaf21ac330e7785d496ec7
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/pcep/pcepy/peer/base.py b/pcep/pcepy/peer/base.py
index ea3d8bdee4da305b1485b0ed1b2c724e9ce2f7e3..f4582716be17f97e090b229178715a58a926fed1 100644 (file)
--- a/pcep/pcepy/peer/base.py
+++ b/pcep/pcepy/peer/base.py
@@ -9,10 +9,11 @@
 import weakref
 import traceback
 import logging
-_LOGGER = logging.getLogger('pcepy.peer')
-
 from pcepy import session as _session
 from pcepy import message as _message
+
+_LOGGER = logging.getLogger('pcepy.peer')
+
 resolve_timeout = _session.resolve_timeout
 min_timeout = _session.min_timeout
 
@@ -761,7 +762,8 @@ class Logger(Handler):
 
     def __getattr__(self, name):
         if name.startswith('on_'):
-            meth = lambda peer, eventargs: self.report_event(name, peer, eventargs)
+            def meth(peer, eventargs):
+                return self.report_event(name, peer, eventargs)
             self.__dict__[name] = meth
             return meth
         raise AttributeError(name)

diff --git a/pcep/pcepy/session/_session.py b/pcep/pcepy/session/_session.py
index 09cb558fe8186ae961c90f744a28b48dba79673f..60113a391941b919a1e2575a3749a8eb193ee5e5 100644 (file)
--- a/pcep/pcepy/session/_session.py
+++ b/pcep/pcepy/session/_session.py
@@ -7,6 +7,7 @@
 # and is available at http://www.eclipse.org/legal/epl-v10.html
 
 import errno
+import logging
 import os
 import socket as _socket
 try:
@@ -15,14 +16,12 @@ except ImportError:
     import Queue as queue
 import time
 import weakref
-
 from .bus import resolve_timeout
 from pcepy import message as _message
 
 # Standard assigned port for PCEP
 PCEP_PORT = 4189
 
-import logging
 _LOGGER = logging.getLogger('pcepy.session')
 
 

diff --git a/pcep/pcepy/tox.ini b/pcep/pcepy/tox.ini
index e72c76c40ab91c66cc30f8c11836ad99447c7616..c342804619abbde54e58342d7a6ebf65bdde6f38 100644 (file)
--- a/pcep/pcepy/tox.ini
+++ b/pcep/pcepy/tox.ini
@@ -14,21 +14,10 @@ skipsdist = true
 [testenv:pep8]
 deps =
     flake8
-    pep8==1.5.7
-## These issues have to be resolved before upgrading to 1.7.0:
-# ./peer/base.py:14:1: E402 module level import not at top of file
-# ./peer/base.py:15:1: E402 module level import not at top of file
-# ./peer/base.py:633:13: W503 line break before binary operator
-# ./peer/base.py:634:13: W503 line break before binary operator
-# ./peer/base.py:764:13: E731 do not assign a lambda expression, use a def
-# ./session/_session.py:25:1: E402 module level import not at top of file
-# ./session/_session.py:80:17: W503 line break before binary operator
-# ./session/_session.py:81:17: W503 line break before binary operator
-# ./session/_session.py:82:17: W503 line break before binary operator
+    pep8
 commands = flake8
 
 [flake8]
 show-source = True
 max-line-length = 120
-
-
+exclude = .tox