From be401bc2f87ee3ab6fb48a2dd4d415581f847a6e Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Fri, 28 Jul 2017 18:27:59 +0200
Subject: [PATCH] fix linting issues

---
 _pytest/outcomes.py    | 11 +++++------
 _pytest/recwarn.py     |  1 +
 _pytest/runner.py      |  5 +----
 _pytest/skipping.py    |  1 -
 testing/test_runner.py |  1 -
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/_pytest/outcomes.py b/_pytest/outcomes.py
index 57e361260..ff5ef756d 100644
--- a/_pytest/outcomes.py
+++ b/_pytest/outcomes.py
@@ -22,7 +22,7 @@ class OutcomeException(BaseException):
             if isinstance(val, bytes):
                 val = py._builtin._totext(val, errors='replace')
             return val
-        return "<%s instance>" %(self.__class__.__name__,)
+        return "<%s instance>" % (self.__class__.__name__,)
     __str__ = __repr__
 
 
@@ -52,6 +52,7 @@ class Exit(KeyboardInterrupt):
 
 # exposed helper methods
 
+
 def exit(msg):
     """ exit testing process as if KeyboardInterrupt was triggered. """
     __tracebackhide__ = True
@@ -87,7 +88,6 @@ def fail(msg="", pytrace=True):
 fail.Exception = Failed
 
 
-
 class XFailed(fail.Exception):
     """ raised from an explicit call to pytest.xfail() """
 
@@ -101,7 +101,6 @@ def xfail(reason=""):
 xfail.Exception = XFailed
 
 
-
 def importorskip(modname, minversion=None):
     """ return imported module if it has at least "minversion" as its
     __version__ attribute.  If no minversion is specified the a skip
@@ -109,7 +108,7 @@ def importorskip(modname, minversion=None):
     """
     import warnings
     __tracebackhide__ = True
-    compile(modname, '', 'eval') # to catch syntaxerrors
+    compile(modname, '', 'eval')  # to catch syntaxerrors
     should_skip = False
 
     with warnings.catch_warnings():
@@ -123,7 +122,7 @@ def importorskip(modname, minversion=None):
             # Do not raise chained exception here(#1485)
             should_skip = True
     if should_skip:
-        raise Skipped("could not import %r" %(modname,), allow_module_level=True)
+        raise Skipped("could not import %r" % (modname,), allow_module_level=True)
     mod = sys.modules[modname]
     if minversion is None:
         return mod
@@ -136,6 +135,6 @@ def importorskip(modname, minversion=None):
                           "pkg_resources to parse version strings." % (modname,),
                           allow_module_level=True)
         if verattr is None or pv(verattr) < pv(minversion):
-            raise Skipped("module %r has __version__ %r, required is: %r" %(
+            raise Skipped("module %r has __version__ %r, required is: %r" % (
                           modname, verattr, minversion), allow_module_level=True)
     return mod
diff --git a/_pytest/recwarn.py b/_pytest/recwarn.py
index 757b043a1..c9fa872c0 100644
--- a/_pytest/recwarn.py
+++ b/_pytest/recwarn.py
@@ -11,6 +11,7 @@ import warnings
 from _pytest.fixtures import yield_fixture
 from _pytest.outcomes import fail
 
+
 @yield_fixture
 def recwarn():
     """Return a WarningsRecorder instance that provides these methods:
diff --git a/_pytest/runner.py b/_pytest/runner.py
index 0837b01c3..a1daa9761 100644
--- a/_pytest/runner.py
+++ b/_pytest/runner.py
@@ -13,6 +13,7 @@ from _pytest.outcomes import skip, Skipped, TEST_OUTCOME
 #
 # pytest plugin hooks
 
+
 def pytest_addoption(parser):
     group = parser.getgroup("terminal reporting", "reporting", after="general")
     group.addoption('--durations',
@@ -505,7 +506,3 @@ def collect_one_node(collector):
     if call and check_interactive_exception(call, rep):
         ihook.pytest_exception_interact(node=collector, call=call, report=rep)
     return rep
-
-
-
-
diff --git a/_pytest/skipping.py b/_pytest/skipping.py
index 6954a0555..2fd61448a 100644
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -60,7 +60,6 @@ def pytest_configure(config):
                             )
 
 
-
 class MarkEvaluator:
     def __init__(self, item, name):
         self.item = item
diff --git a/testing/test_runner.py b/testing/test_runner.py
index f1fcb86c7..1ab449ba3 100644
--- a/testing/test_runner.py
+++ b/testing/test_runner.py
@@ -461,7 +461,6 @@ def test_outcomeexception_passes_except_Exception():
             pass
 
 
-
 def test_pytest_exit():
     try:
         pytest.exit("hello")