From 8028e73d343dec78be509442c2f12127a04f735f Mon Sep 17 00:00:00 2001 From: Tim Brown Date: Sun, 1 Nov 2020 14:39:48 +1000 Subject: mypy: use annotations for typing instead of comments --- qutebrowser/keyinput/modeman.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'qutebrowser/keyinput/modeman.py') 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)) -- cgit v1.2.3-54-g00ecf