Use typing.TYPE_CHECKING

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

13 files changed, 21 insertions, 31 deletions

diff --git a/.coveragerc b/.coveragerc
index 69b126e12..6f166bed2 100644
--- a/.coveragerc
+++ b/.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
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index fa78378ac..4bd76a16a 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/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
diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index f0c3209c0..ae40dffa1 100644
--- a/qutebrowser/browser/webelem.py
+++ b/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
 
diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py
index 688fb7d65..3856e8154 100644
--- a/qutebrowser/browser/webengine/webengineelem.py
+++ b/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
 
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index fd95f29fb..e4c8da66c 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/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]
diff --git a/qutebrowser/browser/webkit/webkitelem.py b/qutebrowser/browser/webkit/webkitelem.py
index 3b65fc7a6..33f5a5099 100644
--- a/qutebrowser/browser/webkit/webkitelem.py
+++ b/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
 
diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index ad3d4176f..b5f2ecd06 100644
--- a/qutebrowser/commands/runners.py
+++ b/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]
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 074cd7d56..dd772b841 100644
--- a/qutebrowser/config/config.py
+++ b/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
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index e231c29d3..faadc7084 100644
--- a/qutebrowser/config/configcommands.py
+++ b/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
 
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index f0f0a336f..e7066fa11 100644
--- a/qutebrowser/config/configfiles.py
+++ b/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
 
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index 6392e4ca6..9056a9e87 100644
--- a/qutebrowser/config/configutils.py
+++ b/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
 
diff --git a/qutebrowser/extensions/loader.py b/qutebrowser/extensions/loader.py
index d10e0919f..5b2d2c0eb 100644
--- a/qutebrowser/extensions/loader.py
+++ b/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
 
diff --git a/qutebrowser/misc/objects.py b/qutebrowser/misc/objects.py
index d466a78c8..b903d8e5d 100644
--- a/qutebrowser/misc/objects.py
+++ b/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