diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-05-09 17:05:00 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-05-09 18:16:53 +0200 |
| commit | 2bffb87d149115a9ab4cfeac0dc3e7e0139902ad (patch) | |
| tree | 25f87b885d5c2d5ea54a2cf469604209c8c50af9 /qutebrowser/keyinput | |
| parent | 47e72bc2228846e901c2f6541fcb803b2e885e56 (diff) | |
| download | qutebrowser-2bffb87d149115a9ab4cfeac0dc3e7e0139902ad.tar.gz qutebrowser-2bffb87d149115a9ab4cfeac0dc3e7e0139902ad.zip | |
mypy: Fix typing around eventfilters
See #5368
Diffstat (limited to 'qutebrowser/keyinput')
| -rw-r--r-- | qutebrowser/keyinput/eventfilter.py | 4 | ||||
| -rw-r--r-- | qutebrowser/keyinput/modeman.py | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/qutebrowser/keyinput/eventfilter.py b/qutebrowser/keyinput/eventfilter.py index 992d9f4ce..6ef0dd201 100644 --- a/qutebrowser/keyinput/eventfilter.py +++ b/qutebrowser/keyinput/eventfilter.py @@ -19,6 +19,8 @@ """Global Qt event filter which dispatches key events.""" +import typing + from PyQt5.QtCore import pyqtSlot, QObject, QEvent from PyQt5.QtGui import QKeyEvent, QWindow from PyQt5.QtWidgets import QApplication @@ -100,7 +102,7 @@ class EventFilter(QObject): handler = self._handlers[typ] try: - return handler(event) + return handler(typing.cast(QKeyEvent, event)) except: # If there is an exception in here and we leave the eventfilter # activated, we'll get an infinite loop and a stack overflow. diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py index 3afbe6320..e0752d0e3 100644 --- a/qutebrowser/keyinput/modeman.py +++ b/qutebrowser/keyinput/modeman.py @@ -246,7 +246,8 @@ class ModeManager(QObject): match = parser.handle(event, dry_run=dry_run) is_non_alnum = ( - event.modifiers() not in [Qt.NoModifier, Qt.ShiftModifier] or + event.modifiers() not in [Qt.NoModifier, # type: ignore + Qt.ShiftModifier] or not event.text().strip()) forward_unbound_keys = config.cache['input.forward_unbound_keys'] @@ -415,9 +416,9 @@ class ModeManager(QObject): QEvent.KeyRelease: self._handle_keyrelease, QEvent.ShortcutOverride: functools.partial(self._handle_keypress, dry_run=True), - } # type: typing.Mapping[QEvent.Type, typing.Callable[[QEvent], bool]] + } # type: Mapping[QEvent.Type, Callable[[QKeyEvent], bool]] handler = handlers[event.type()] - return handler(event) + return handler(cast(QKeyEvent, event)) @cmdutils.register(instance='mode-manager', scope='window') def clear_keychain(self) -> None: |