From fe7050ba004527edce5dabfb983d7efcf4d7dfa1 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 4 Oct 2018 18:45:30 -0300
Subject: [PATCH] Fix lint

---
 src/_pytest/pytester.py  | 2 +-
 testing/test_pytester.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
index 9591f3b52..15638e42b 100644
--- a/src/_pytest/pytester.py
+++ b/src/_pytest/pytester.py
@@ -1065,7 +1065,7 @@ class Testdir(object):
             popen = self.popen(
                 cmdargs, stdout=f1, stderr=f2, close_fds=(sys.platform != "win32")
             )
-            timeout = kwargs.get('timeout')
+            timeout = kwargs.get("timeout")
             if timeout is None:
                 ret = popen.wait()
             elif six.PY3:
diff --git a/testing/test_pytester.py b/testing/test_pytester.py
index 9ddbc1380..ebc699cc5 100644
--- a/testing/test_pytester.py
+++ b/testing/test_pytester.py
@@ -3,7 +3,6 @@ from __future__ import absolute_import, division, print_function
 import os
 import py.path
 import pytest
-import subprocess
 import sys
 import _pytest.pytester as pytester
 from _pytest.pytester import HookRecorder
@@ -413,7 +412,7 @@ def test_testdir_run_timeout_expires(testdir):
     testfile = testdir.makepyfile(
         """
         import time
-        
+
         def test_timeout():
             time.sleep(10)"""
     )