diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py index 29f046e61..54258cc1f 100644 --- a/_pytest/_code/code.py +++ b/_pytest/_code/code.py @@ -119,7 +119,7 @@ class Frame(object): """ f_locals = self.f_locals.copy() f_locals.update(vars) - py.builtin.exec_(code, self.f_globals, f_locals ) + py.builtin.exec_(code, self.f_globals, f_locals) def repr(self, object): """ return a 'safe' (non-recursive, one-line) string repr for 'object' diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py index 2783f7685..e5946f61e 100644 --- a/testing/code/test_excinfo.py +++ b/testing/code/test_excinfo.py @@ -113,7 +113,7 @@ class TestTraceback_f_g_h(object): def test_traceback_entry_getsource(self): tb = self.excinfo.traceback - s = str(tb[-1].getsource() ) + s = str(tb[-1].getsource()) assert s.startswith("def f():") assert s.endswith("raise ValueError") diff --git a/testing/test_assertion.py b/testing/test_assertion.py index 3f6ae394c..a74496a65 100644 --- a/testing/test_assertion.py +++ b/testing/test_assertion.py @@ -881,7 +881,7 @@ def test_exception_handling_no_traceback(testdir): ]) -@pytest.mark.skipif("'__pypy__' in sys.builtin_module_names or sys.platform.startswith('java')" ) +@pytest.mark.skipif("'__pypy__' in sys.builtin_module_names or sys.platform.startswith('java')") def test_warn_missing(testdir): testdir.makepyfile("") result = testdir.run(sys.executable, "-OO", "-m", "pytest", "-h") diff --git a/tox.ini b/tox.ini index 3e74833b0..b8d0ece8f 100644 --- a/tox.ini +++ b/tox.ini @@ -196,6 +196,6 @@ filterwarnings = ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning [flake8] -ignore = E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731 +ignore = E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731 max-line-length = 120 exclude = _pytest/vendored_packages/pluggy.py