From 97d0cff93b452de34f5d415ac9c7ccf9d812a01e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Thu, 22 Nov 2018 13:54:17 +0100
Subject: [PATCH] mypy: Ignore ImportError handling

See https://github.com/python/mypy/issues/1153
---
 qutebrowser/browser/qutescheme.py | 2 +-
 qutebrowser/misc/checkpyver.py    | 8 ++++----
 qutebrowser/misc/earlyinit.py     | 2 +-
 qutebrowser/qt.py                 | 2 +-
 qutebrowser/utils/qtutils.py      | 2 +-
 qutebrowser/utils/version.py      | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 0fa9366a6..b78404de9 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -37,7 +37,7 @@ try:
     import secrets
 except ImportError:
     # New in Python 3.6
-    secrets = None
+    secrets = None  # type: ignore
 
 from PyQt5.QtCore import QUrlQuery, QUrl, qVersion
 
diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py
index 50330ef88..cf8e13810 100644
--- a/qutebrowser/misc/checkpyver.py
+++ b/qutebrowser/misc/checkpyver.py
@@ -30,12 +30,12 @@ try:
 except ImportError:  # pragma: no cover
     try:
         # Python2
-        from Tkinter import Tk
-        import tkMessageBox as messagebox
+        from Tkinter import Tk  # type: ignore
+        import tkMessageBox as messagebox  # type: ignore
     except ImportError:
         # Some Python without Tk
-        Tk = None
-        messagebox = None
+        Tk = None  # type: ignore
+        messagebox = None  # type: ignore
 
 
 # First we check the version of Python. This code should run fine with python2
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index b29e1508f..38dffa691 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -38,7 +38,7 @@ import datetime
 try:
     import tkinter
 except ImportError:
-    tkinter = None
+    tkinter = None  # type: ignore
 
 # NOTE: No qutebrowser or PyQt import should be done here, as some early
 # initialization needs to take place before that!
diff --git a/qutebrowser/qt.py b/qutebrowser/qt.py
index 2878bbe98..d9f1dc58d 100644
--- a/qutebrowser/qt.py
+++ b/qutebrowser/qt.py
@@ -25,4 +25,4 @@
 try:
     from PyQt5 import sip
 except ImportError:
-    import sip
+    import sip  # type: ignore
diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py
index c634eb95f..a7c30919f 100644
--- a/qutebrowser/utils/qtutils.py
+++ b/qutebrowser/utils/qtutils.py
@@ -39,7 +39,7 @@ from PyQt5.QtCore import (qVersion, QEventLoop, QDataStream, QByteArray,
 try:
     from PyQt5.QtWebKit import qWebKitVersion
 except ImportError:  # pragma: no cover
-    qWebKitVersion = None
+    qWebKitVersion = None  # type: ignore
 
 
 MAXVALS = {
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 7a99a4b65..a52e31ed8 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -42,12 +42,12 @@ from PyQt5.QtWidgets import QApplication
 try:
     from PyQt5.QtWebKit import qWebKitVersion
 except ImportError:  # pragma: no cover
-    qWebKitVersion = None
+    qWebKitVersion = None  # type: ignore
 
 try:
     from PyQt5.QtWebEngineWidgets import QWebEngineProfile
 except ImportError:  # pragma: no cover
-    QWebEngineProfile = None
+    QWebEngineProfile = None  # type: ignore
 
 import qutebrowser
 from qutebrowser.utils import log, utils, standarddir, usertypes, message