Use typing.TYPE_CHECKING

Now that we depend on Python >= 3.5.2, we can use it everywhere.

.coveragerc

@@ -14,7 +14,7 @@ exclude_lines =
     raise NotImplementedError
     raise utils\.Unreachable
     if __name__ == ["']__main__["']:
-    if MYPY:
+    if typing.TYPE_CHECKING:
 
 [xml]
 output=coverage.xml

qutebrowser/browser/browsertab.py

@@ -42,9 +42,8 @@ from qutebrowser.utils import (utils, objreg, usertypes, log, qtutils,
 from qutebrowser.misc import miscwidgets, objects
 from qutebrowser.browser import eventfilter, hints
 from qutebrowser.qt import sip
-MYPY = False
-if MYPY:
-    # pylint can't interpret type comments with Python 3.7
+
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import,useless-suppression
     from qutebrowser.browser import webelem
     from qutebrowser.browser.inspector import AbstractWebInspector

qutebrowser/browser/webelem.py

@@ -29,8 +29,8 @@ from qutebrowser.config import config
 from qutebrowser.keyinput import modeman
 from qutebrowser.mainwindow import mainwindow
 from qutebrowser.utils import log, usertypes, utils, qtutils, objreg
-MYPY = False
-if MYPY:
+
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import,useless-suppression
     from qutebrowser.browser import browsertab
 

qutebrowser/browser/webengine/webengineelem.py

@@ -31,8 +31,8 @@ from PyQt5.QtWebEngineWidgets import QWebEngineSettings
 
 from qutebrowser.utils import log, javascript, urlutils, usertypes
 from qutebrowser.browser import webelem
-MYPY = False
-if MYPY:
+
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import,useless-suppression
     from qutebrowser.browser.webengine import webenginetab
 

qutebrowser/browser/webkit/network/networkmanager.py

@@ -21,7 +21,7 @@
 
 import collections
 import html
-import typing  # pylint: disable=unused-import
+import typing
 
 import attr
 from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QCoreApplication, QUrl,
@@ -29,12 +29,6 @@ from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QCoreApplication, QUrl,
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkReply, QSslSocket
 
 from qutebrowser.config import config
-
-MYPY = False
-if MYPY:
-    # pylint can't interpret type comments with Python 3.7
-    # pylint: disable=unused-import,useless-suppression
-    from qutebrowser.mainwindow import prompt
 from qutebrowser.utils import (message, log, usertypes, utils, objreg,
                                urlutils, debug)
 from qutebrowser.browser import shared
@@ -43,6 +37,10 @@ from qutebrowser.browser.webkit import certificateerror
 from qutebrowser.browser.webkit.network import (webkitqutescheme, networkreply,
                                                 filescheme)
 
+if typing.TYPE_CHECKING:
+    # pylint: disable=unused-import,useless-suppression
+    from qutebrowser.mainwindow import prompt
+
 
 HOSTBLOCK_ERROR_STRING = '%HOSTBLOCK%'
 _proxy_auth_cache = {}  # type: typing.Dict[ProxyId, prompt.AuthInfo]

qutebrowser/browser/webkit/webkitelem.py

@@ -28,8 +28,8 @@ from PyQt5.QtWebKitWidgets import QWebFrame
 from qutebrowser.config import config
 from qutebrowser.utils import log, utils, javascript, usertypes
 from qutebrowser.browser import webelem
-MYPY = False
-if MYPY:
+
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import,useless-suppression
     from qutebrowser.browser.webkit import webkittab
 

qutebrowser/commands/runners.py

@@ -33,8 +33,7 @@ from qutebrowser.commands import cmdexc
 from qutebrowser.utils import message, objreg, qtutils, usertypes, utils
 from qutebrowser.misc import split, objects
 
-MYPY = False
-if MYPY:
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import
     from qutebrowser.mainwindow import tabbedbrowser
 _ReplacementFunction = typing.Callable[['tabbedbrowser.TabbedBrowser'], str]

qutebrowser/config/config.py

@@ -32,8 +32,7 @@ from qutebrowser.utils import utils, log, jinja, urlmatch
 from qutebrowser.misc import objects, debugcachestats
 from qutebrowser.keyinput import keyutils
 
-MYPY = False
-if MYPY:
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import,useless-suppression
     from typing import Tuple, MutableMapping
     from qutebrowser.config import configcache, configfiles

qutebrowser/config/configcommands.py

@@ -32,8 +32,7 @@ from qutebrowser.config import configtypes, configexc, configfiles, configdata
 from qutebrowser.misc import editor
 from qutebrowser.keyinput import keyutils
 
-MYPY = False
-if MYPY:
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import,useless-suppression
     from qutebrowser.config.config import Config, KeyConfig
 

qutebrowser/config/configfiles.py

@@ -38,8 +38,7 @@ from qutebrowser.config import configexc, config, configdata, configutils
 from qutebrowser.keyinput import keyutils
 from qutebrowser.utils import standarddir, utils, qtutils, log, urlmatch
 
-MYPY = False
-if MYPY:
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import, useless-suppression
     from qutebrowser.misc import savemanager
 

qutebrowser/config/configutils.py

@@ -29,8 +29,7 @@ from PyQt5.QtCore import QUrl
 from qutebrowser.utils import utils, urlmatch
 from qutebrowser.config import configexc
 
-MYPY = False
-if MYPY:
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import,useless-suppression
     from qutebrowser.config import configdata
 

qutebrowser/extensions/loader.py

@@ -34,8 +34,7 @@ from qutebrowser import components
 from qutebrowser.config import config
 from qutebrowser.utils import log, standarddir, objreg
 
-MYPY = False
-if MYPY:
+if typing.TYPE_CHECKING:
     # pylint: disable=unused-import,useless-suppression
     import argparse
 

qutebrowser/misc/objects.py

@@ -24,8 +24,7 @@
 
 import typing
 
-MYPY = False
-if MYPY:
+if typing.TYPE_CHECKING:
     from qutebrowser.utils import usertypes
     from qutebrowser.commands import command