Merge branch 'issue-2836-fixture-collection-bug' of github.com:tom-da…

…lton-fanduel/pytest into issue-2836-fixture-collection-bug
pytest-dev · Oct 24, 2017 · a5ac19c · a5ac19c
2 parents 14e3a5f + a3ec3df
commit a5ac19c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/_pytest/python_api.py b/_pytest/python_api.py
@@ -217,7 +217,8 @@ def tolerance(self):
         absolute tolerance or a relative tolerance, depending on what the user
         specified or which would be larger.
         """
-        def set_default(x, default): return x if x is not None else default
+        def set_default(x, default):
+            return x if x is not None else default
 
         # Figure out what the absolute tolerance should be.  ``self.abs`` is
         # either None or a value specified by the user.

diff --git a/tox.ini b/tox.ini
@@ -213,3 +213,8 @@ filterwarnings =
 [flake8]
 max-line-length = 120
 exclude = _pytest/vendored_packages/pluggy.py
+ignore=
+    # do not use bare except'
+    E722
+    # ambiguous variable name 'l'
+    E741