From d74daf92940c8c1a046e58b878d5a66e8d5184cf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 14 Sep 2018 22:49:41 +0200
Subject: [PATCH] Fix lint

---
 qutebrowser/browser/webengine/webenginetab.py | 3 +--
 scripts/dev/run_pylint_on_tests.py            | 1 +
 tests/helpers/fixtures.py                     | 8 ++++++--
 tests/unit/browser/test_caret.py              | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 78913e92e..ad95c197b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -21,12 +21,11 @@
 
 import math
 import functools
-import sys
 import re
 import html as html_utils
 
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
-                          QUrl, QTimer, QObject, qVersion)
+                          QUrl, QTimer, QObject)
 from PyQt5.QtGui import QKeyEvent, QIcon
 from PyQt5.QtNetwork import QAuthenticator
 from PyQt5.QtWidgets import QApplication
diff --git a/scripts/dev/run_pylint_on_tests.py b/scripts/dev/run_pylint_on_tests.py
index f7855dfb7..d8523a4b4 100644
--- a/scripts/dev/run_pylint_on_tests.py
+++ b/scripts/dev/run_pylint_on_tests.py
@@ -52,6 +52,7 @@ def main():
         # pytest fixtures
         'redefined-outer-name',
         'unused-argument',
+        'too-many-arguments',
         # things which are okay in tests
         'missing-docstring',
         'protected-access',
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 092b61f12..ff5702e47 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -52,6 +52,9 @@ from qutebrowser.misc import savemanager, sql, objects
 from qutebrowser.keyinput import modeman
 
 
+_qute_scheme_handler = None
+
+
 class WinRegistryHelper:
 
     """Helper class for win_registry."""
@@ -160,13 +163,14 @@ def testdata_scheme(qapp):
         global _qute_scheme_handler
         from qutebrowser.browser.webengine import webenginequtescheme
         from PyQt5.QtWebEngineWidgets import QWebEngineProfile
-        _qute_scheme_handler = webenginequtescheme.QuteSchemeHandler(parent=qapp)
+        _qute_scheme_handler = webenginequtescheme.QuteSchemeHandler(
+            parent=qapp)
         _qute_scheme_handler.install(QWebEngineProfile.defaultProfile())
     except ImportError:
         pass
 
     @qutescheme.add_handler('testdata')
-    def handler(url):
+    def handler(url):  # pylint: disable=unused-variable
         file_abs = os.path.abspath(os.path.dirname(__file__))
         filename = os.path.join(file_abs, '..', 'end2end',
                                 url.path().lstrip('/'))
diff --git a/tests/unit/browser/test_caret.py b/tests/unit/browser/test_caret.py
index 63699976c..7ef65fa5b 100644
--- a/tests/unit/browser/test_caret.py
+++ b/tests/unit/browser/test_caret.py
@@ -19,7 +19,6 @@
 
 """Tests for caret browsing mode."""
 
-import os.path
 import textwrap
 
 import pytest
@@ -55,7 +54,8 @@ class Selection:
         quickly, we try to read it multiple times.
         """
         for _ in range(10):
-            with self._qtbot.wait_signal(self._callback_checker.got_result) as blocker:
+            with self._qtbot.wait_signal(
+                    self._callback_checker.got_result) as blocker:
                 self._caret.selection(self._callback_checker.callback)
 
             selection = blocker.args[0]