From 450619e25af5ab8bf7352bae85c59002fe09ec49 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 20 Dec 2021 12:07:02 +0100
Subject: Update annotations for new mypy

---
 qutebrowser/extensions/loader.py | 4 +---
 qutebrowser/utils/debug.py       | 4 ++--
 qutebrowser/utils/log.py         | 7 +++++--
 qutebrowser/utils/version.py     | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/extensions/loader.py b/qutebrowser/extensions/loader.py
index c7b619b3e..2774d04e4 100644
--- a/qutebrowser/extensions/loader.py
+++ b/qutebrowser/extensions/loader.py
@@ -95,9 +95,7 @@ def load_components(*, skip_hooks: bool = False) -> None:
 def walk_components() -> Iterator[ExtensionInfo]:
     """Yield ExtensionInfo objects for all modules."""
     for _finder, name, ispkg in pkgutil.walk_packages(
-            # Only packages have a __path__ attribute,
-            # but we're sure this is one.
-            path=components.__path__,  # type: ignore[attr-defined]
+            path=components.__path__,
             prefix=components.__name__ + '.',
             onerror=_on_walk_error):
         if ispkg:
diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py
index 7d069909a..0fa74f4e7 100644
--- a/qutebrowser/utils/debug.py
+++ b/qutebrowser/utils/debug.py
@@ -81,7 +81,7 @@ def log_signals(obj: QObject) -> QObject:
                         pass
 
     if inspect.isclass(obj):
-        old_init = obj.__init__  # type: ignore[misc]
+        old_init = obj.__init__
 
         @functools.wraps(old_init)
         def new_init(self: Any, *args: Any, **kwargs: Any) -> None:
@@ -89,7 +89,7 @@ def log_signals(obj: QObject) -> QObject:
             old_init(self, *args, **kwargs)
             connect_log_slot(self)
 
-        obj.__init__ = new_init  # type: ignore[misc]
+        obj.__init__ = new_init
     else:
         connect_log_slot(obj)
 
diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py
index 54ca4029b..6677e383e 100644
--- a/qutebrowser/utils/log.py
+++ b/qutebrowser/utils/log.py
@@ -43,7 +43,9 @@ except ImportError:
     colorama = None
 
 if TYPE_CHECKING:
+    # pylint: disable=unused-import
     from qutebrowser.config import config as configmodule
+    from typing import TextIO
 
 _log_inited = False
 _args = None
@@ -257,7 +259,7 @@ def _init_handlers(
         force_color: bool,
         json_logging: bool,
         ram_capacity: int
-) -> Tuple[logging.StreamHandler, Optional['RAMHandler']]:
+) -> Tuple["logging.StreamHandler[TextIO]", Optional['RAMHandler']]:
     """Init log handlers.
 
     Args:
@@ -727,7 +729,8 @@ class ColoredFormatter(logging.Formatter):
                  datefmt: str,
                  style: str, *,
                  use_colors: bool) -> None:
-        super().__init__(fmt, datefmt, style)
+        super().__init__(fmt, datefmt, style)  # type: ignore[arg-type]
+        # FIXME Use Literal["%", "{", "$"] once we use Python 3.8 or typing_extensions
         self.use_colors = use_colors
 
     def format(self, record: logging.LogRecord) -> str:
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 3beb6fb83..8da86dd00 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -514,7 +514,8 @@ def _get_pyqt_webengine_qt_version() -> Optional[str]:
         import importlib_metadata
     except ImportError:
         try:
-            import importlib.metadata as importlib_metadata  # type: ignore[no-redef]
+            # pylint: disable=line-too-long
+            import importlib.metadata as importlib_metadata  # type: ignore[import, no-redef]
         except ImportError:
             log.misc.debug("Neither importlib.metadata nor backport available")
             return None
-- 
cgit v1.2.3-54-g00ecf