summaryrefslogtreecommitdiff
path: root/qutebrowser/keyinput/modeman.py
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-01-11 12:00:30 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-01-11 18:47:15 +0100
commitc1758230200814e84055f3e2954cb69f0fddf5d8 (patch)
treeb9123f2c04e3337084e0894c0bb17574b9704311 /qutebrowser/keyinput/modeman.py
parent8760dc1b17dcf06f7253a9ce7ac7a15af0785492 (diff)
downloadqutebrowser-c1758230200814e84055f3e2954cb69f0fddf5d8.tar.gz
qutebrowser-c1758230200814e84055f3e2954cb69f0fddf5d8.zip
Add objects.qapp to avoid needing to None-check
We know that QApplication.instance() will always be non-None for practical purposes, but the stubs now (correctly) declare it as Optional. See https://github.com/stlehmann/PyQt5-stubs/pull/126
Diffstat (limited to 'qutebrowser/keyinput/modeman.py')
-rw-r--r--qutebrowser/keyinput/modeman.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index dcc6fa949..df5f08e2c 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -25,7 +25,6 @@ from typing import Mapping, Callable, MutableMapping, Union, Set, cast
import attr
from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QObject, QEvent
from PyQt5.QtGui import QKeyEvent
-from PyQt5.QtWidgets import QApplication
from qutebrowser.commands import runners
from qutebrowser.keyinput import modeparsers, basekeyparser
@@ -33,6 +32,7 @@ from qutebrowser.config import config
from qutebrowser.api import cmdutils
from qutebrowser.utils import usertypes, log, objreg, utils
from qutebrowser.browser import hints
+from qutebrowser.misc import objects
INPUT_MODES = [usertypes.KeyMode.insert, usertypes.KeyMode.passthrough]
PROMPT_MODES = [usertypes.KeyMode.prompt, usertypes.KeyMode.yesno]
@@ -307,7 +307,7 @@ class ModeManager(QObject):
self._releaseevents_to_pass.add(KeyEvent.from_event(event))
if curmode != usertypes.KeyMode.insert:
- focus_widget = QApplication.instance().focusWidget()
+ focus_widget = objects.qapp.focusWidget()
log.modes.debug("match: {}, forward_unbound_keys: {}, "
"passthrough: {}, is_non_alnum: {}, dry_run: {} "
"--> filter: {} (focused: {!r})".format(