mypy: use annotations for typing instead of comments

4 files changed, 15 insertions, 14 deletions

diff --git a/qutebrowser/browser/webengine/interceptor.py b/qutebrowser/browser/webengine/interceptor.py
index d4dcb522f..e5a414dfd 100644
--- a/qutebrowser/browser/webengine/interceptor.py
+++ b/qutebrowser/browser/webengine/interceptor.py
@@ -39,9 +39,9 @@ class WebEngineRequest(interceptors.Request):
 
     _WHITELISTED_REQUEST_METHODS = {QByteArray(b'GET'), QByteArray(b'HEAD')}
 
-    _webengine_info = attr.ib(default=None)  # type: QWebEngineUrlRequestInfo
+    _webengine_info: QWebEngineUrlRequestInfo = attr.ib(default=None)
     #: If this request has been redirected already
-    _redirected = attr.ib(init=False, default=False)  # type: bool
+    _redirected: bool = attr.ib(init=False, default=False)
 
     def redirect(self, url: QUrl) -> None:
         if self._redirected:
diff --git a/qutebrowser/config/stylesheet.py b/qutebrowser/config/stylesheet.py
index 10e6e4e52..3c68fc0b9 100644
--- a/qutebrowser/config/stylesheet.py
+++ b/qutebrowser/config/stylesheet.py
@@ -81,13 +81,13 @@ class _StyleSheetObserver(QObject):
         if update:
             self.setParent(self._obj)
         if stylesheet is None:
-            self._stylesheet = obj.STYLESHEET  # type: str
+            self._stylesheet: str = obj.STYLESHEET
         else:
             self._stylesheet = stylesheet
 
         if update:
-            self._options = jinja.template_config_variables(
-                self._stylesheet)  # type: Optional[FrozenSet[str]]
+            self._options: Optional[FrozenSet[str]] = jinja.template_config_variables(
+                self._stylesheet)
         else:
             self._options = None
 
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index 27e4be34e..dcc6fa949 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -54,8 +54,8 @@ class KeyEvent:
         text: A string (QKeyEvent::text).
     """
 
-    key = attr.ib()  # type: Qt.Key
-    text = attr.ib()  # type: str
+    key: Qt.Key = attr.ib()
+    text: str = attr.ib()
 
     @classmethod
     def from_event(cls, event: QKeyEvent) -> 'KeyEvent':
@@ -89,7 +89,7 @@ def init(win_id: int, parent: QObject) -> 'ModeManager':
 
     modeman.hintmanager = hintmanager
 
-    keyparsers = {
+    keyparsers: ParserDictType = {
         usertypes.KeyMode.normal:
             modeparsers.NormalKeyParser(
                 win_id=win_id,
@@ -186,7 +186,7 @@ def init(win_id: int, parent: QObject) -> 'ModeManager':
                 win_id=win_id,
                 commandrunner=commandrunner,
                 parent=modeman),
-    }  # type: ParserDictType
+    }
 
     for mode, parser in keyparsers.items():
         modeman.register(mode, parser)
@@ -259,10 +259,10 @@ class ModeManager(QObject):
     def __init__(self, win_id: int, parent: QObject = None) -> None:
         super().__init__(parent)
         self._win_id = win_id
-        self.parsers = {}  # type: ParserDictType
+        self.parsers: ParserDictType = {}
         self._prev_mode = usertypes.KeyMode.normal
         self.mode = usertypes.KeyMode.normal
-        self._releaseevents_to_pass = set()  # type: Set[KeyEvent]
+        self._releaseevents_to_pass: Set[KeyEvent] = set()
         # Set after __init__
         self.hintmanager = cast(hints.HintManager, None)
 
@@ -457,12 +457,12 @@ class ModeManager(QObject):
         Return:
             True if event should be filtered, False otherwise.
         """
-        handlers = {
+        handlers: Mapping[QEvent.Type, Callable[[QKeyEvent], bool]] = {
             QEvent.KeyPress: self._handle_keypress,
             QEvent.KeyRelease: self._handle_keyrelease,
             QEvent.ShortcutOverride:
                 functools.partial(self._handle_keypress, dry_run=True),
-        }  # type: Mapping[QEvent.Type, Callable[[QKeyEvent], bool]]
+        }
         handler = handlers[event.type()]
         return handler(cast(QKeyEvent, event))
 
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 6952acf97..21961101f 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -181,7 +181,8 @@ def read_file(filename: str, binary: bool = False) -> Any:
         # https://github.com/pyinstaller/pyinstaller/wiki/FAQ#misc
         fn = os.path.join(os.path.dirname(sys.executable), filename)
         if binary:
-            with open(fn, 'rb') as f:  # type: IO
+            f: IO
+            with open(fn, 'rb') as f:
                 return f.read()
         else:
             with open(fn, 'r', encoding='utf-8') as f: