From 5c0ebc1f94e69d1b2b9a7577f4d4a34618e9de27 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 18 Sep 2017 21:24:09 +0200
Subject: [PATCH] Fix lint

---
 qutebrowser/app.py                                   | 6 +++---
 qutebrowser/browser/qutescheme.py                    | 3 +--
 qutebrowser/browser/webkit/network/networkmanager.py | 4 ++--
 qutebrowser/config/config.py                         | 5 +++--
 qutebrowser/misc/earlyinit.py                        | 1 +
 qutebrowser/utils/version.py                         | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index e0b73100c..5bca765eb 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -52,9 +52,9 @@ from qutebrowser.browser.webkit.network import networkmanager
 from qutebrowser.keyinput import macros
 from qutebrowser.mainwindow import mainwindow, prompt
 from qutebrowser.misc import (readline, ipc, savemanager, sessions,
-                              crashsignal, earlyinit, objects, sql, cmdhistory)
-from qutebrowser.utils import (log, version, message, utils, qtutils, urlutils,
-                               objreg, usertypes, standarddir, error)
+                              crashsignal, earlyinit, sql, cmdhistory)
+from qutebrowser.utils import (log, version, message, utils, urlutils, objreg,
+                               usertypes, standarddir, error)
 # pylint: disable=unused-import
 # We import those to run the cmdutils.register decorators.
 from qutebrowser.mainwindow.statusbar import command
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index d4b575260..6bf27e7d8 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -28,7 +28,6 @@ import json
 import os
 import time
 import urllib.parse
-import datetime
 import textwrap
 import pkg_resources
 
@@ -37,7 +36,7 @@ from PyQt5.QtCore import QUrlQuery, QUrl
 import qutebrowser
 from qutebrowser.config import config, configdata, configexc, configdiff
 from qutebrowser.utils import (version, utils, jinja, log, message, docutils,
-                               objreg, usertypes, qtutils)
+                               objreg)
 from qutebrowser.misc import objects
 
 
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 87fa3a263..770cb2f20 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -404,8 +404,8 @@ class NetworkManager(QNetworkAccessManager):
                 current_url = tab.url()
             except (KeyError, RuntimeError):
                 # https://github.com/qutebrowser/qutebrowser/issues/889
-                # Catching RuntimeError because we could be in the middle of the
-                # webpage shutdown here.
+                # Catching RuntimeError because we could be in the middle of
+                # the webpage shutdown here.
                 current_url = QUrl()
 
         self.set_referer(req, current_url)
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 94bb7f582..736b1775c 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -28,7 +28,8 @@ from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl
 from PyQt5.QtWidgets import QMessageBox
 
 from qutebrowser.config import configdata, configexc, configtypes, configfiles
-from qutebrowser.utils import utils, objreg, message, log, usertypes, jinja, qtutils
+from qutebrowser.utils import (utils, objreg, message, log, usertypes, jinja,
+                               qtutils)
 from qutebrowser.misc import objects, msgbox, earlyinit
 from qutebrowser.commands import cmdexc, cmdutils, runners
 from qutebrowser.completion.models import configmodel
@@ -697,7 +698,7 @@ def get_backend(args):
     except ImportError:
         webkit_available = False
     else:
-        webkit_available = qtutils.is_new_webkit()
+        webkit_available = qtutils.is_new_qtwebkit()
 
     if args.backend is not None:
         backends = {
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index 3b85af46d..685aecf2c 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -192,6 +192,7 @@ def check_qt_version():
 
 def check_ssl_support():
     """Check if SSL support is available."""
+    # pylint: disable=unused-variable
     try:
         from PyQt5.QtNetwork import QSslSocket
     except ImportError:
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 903598007..834d4ae3e 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -44,7 +44,7 @@ except ImportError:  # pragma: no cover
     QWebEngineProfile = None
 
 import qutebrowser
-from qutebrowser.utils import log, utils, standarddir, usertypes, qtutils
+from qutebrowser.utils import log, utils, standarddir, usertypes
 from qutebrowser.misc import objects, earlyinit, sql
 from qutebrowser.browser import pdfjs