From a087b8145182412534df9e32388d58a45ec815e5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 16 Oct 2023 21:24:34 +0200
Subject: Adjust for mypy 1.6

See https://mypy-lang.blogspot.com/2023/10/mypy-16-released.html
---
 qutebrowser/keyinput/modeparsers.py |  2 +-
 qutebrowser/misc/checkpyver.py      |  4 ++--
 qutebrowser/qt/sip.py               |  4 ++--
 qutebrowser/utils/qtlog.py          | 13 -------------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py
index 7db169097..05e560111 100644
--- a/qutebrowser/keyinput/modeparsers.py
+++ b/qutebrowser/keyinput/modeparsers.py
@@ -254,7 +254,7 @@ class RegisterKeyParser(CommandKeyParser):
                  mode: usertypes.KeyMode,
                  commandrunner: 'runners.CommandRunner',
                  parent: QObject = None) -> None:
-        super().__init__(mode=usertypes.KeyMode.register,  # type: ignore[arg-type]
+        super().__init__(mode=usertypes.KeyMode.register,
                          win_id=win_id,
                          commandrunner=commandrunner,
                          parent=parent,
diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py
index d2daa41a7..596a7803a 100644
--- a/qutebrowser/misc/checkpyver.py
+++ b/qutebrowser/misc/checkpyver.py
@@ -15,8 +15,8 @@ try:
 except ImportError:  # pragma: no cover
     try:
         # Python2
-        from Tkinter import Tk  # type: ignore[import, no-redef]
-        import tkMessageBox as messagebox  # type: ignore[import, no-redef] # noqa: N813
+        from Tkinter import Tk  # type: ignore[import-not-found, no-redef]
+        import tkMessageBox as messagebox  # type: ignore[import-not-found, no-redef] # noqa: N813
     except ImportError:
         # Some Python without Tk
         Tk = None  # type: ignore[misc, assignment]
diff --git a/qutebrowser/qt/sip.py b/qutebrowser/qt/sip.py
index ab5d9b907..1eb21bc27 100644
--- a/qutebrowser/qt/sip.py
+++ b/qutebrowser/qt/sip.py
@@ -23,7 +23,7 @@ elif machinery.USE_PYQT5:
     try:
         from PyQt5.sip import *
     except ImportError:
-        from sip import *  # type: ignore[import]
+        from sip import *  # type: ignore[import-not-found]
 elif machinery.USE_PYQT6:
     try:
         from PyQt6.sip import *
@@ -31,6 +31,6 @@ elif machinery.USE_PYQT6:
         # While upstream recommends using PyQt5.sip ever since PyQt5 5.11, some
         # distributions still package later versions of PyQt5 with a top-level
         # "sip" rather than "PyQt5.sip".
-        from sip import *  # type: ignore[import]
+        from sip import *  # type: ignore[import-not-found]
 else:
     raise machinery.UnknownWrapper()
diff --git a/qutebrowser/utils/qtlog.py b/qutebrowser/utils/qtlog.py
index 6ec04e559..3c2ab7cc6 100644
--- a/qutebrowser/utils/qtlog.py
+++ b/qutebrowser/utils/qtlog.py
@@ -34,19 +34,6 @@ def shutdown_log() -> None:
 def disable_qt_msghandler() -> Iterator[None]:
     """Contextmanager which temporarily disables the Qt message handler."""
     old_handler = qtcore.qInstallMessageHandler(None)
-    if machinery.IS_QT6:
-        # cast str to Optional[str] to be compatible with PyQt6 type hints for
-        # qInstallMessageHandler
-        old_handler = cast(
-            Optional[
-                Callable[
-                    [qtcore.QtMsgType, qtcore.QMessageLogContext, Optional[str]],
-                    None
-                ]
-            ],
-            old_handler,
-        )
-
     try:
         yield
     finally:
-- 
cgit v1.2.3-54-g00ecf