diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-11-25 15:36:09 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-11-25 15:36:09 +0100 |
| commit | d9387a23629f9aaa93f0a9dce974bf7918f91a1b (patch) | |
| tree | dddd073bc3d3647598df330057f2dc70f8eafb7e /qutebrowser/commands | |
| parent | e6caaed81f0a396628b7ccfcacc8fb77079555a4 (diff) | |
| download | qutebrowser-d9387a23629f9aaa93f0a9dce974bf7918f91a1b.tar.gz qutebrowser-d9387a23629f9aaa93f0a9dce974bf7918f91a1b.zip | |
Use modeman.instance() to get mode manager
See #640
Diffstat (limited to 'qutebrowser/commands')
| -rw-r--r-- | qutebrowser/commands/command.py | 4 | ||||
| -rw-r--r-- | qutebrowser/commands/runners.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py index 231db9d22..ee83a0de2 100644 --- a/qutebrowser/commands/command.py +++ b/qutebrowser/commands/command.py @@ -139,8 +139,8 @@ class Command: Args: win_id: The window ID the command is run in. """ - mode_manager = objreg.get('mode-manager', scope='window', - window=win_id) + from qutebrowser.keyinput import modeman + mode_manager = modeman.instance(win_id) self.validate_mode(mode_manager.mode) if self.backend is not None and objects.backend != self.backend: diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py index c18b5f6fb..ea3e93cb0 100644 --- a/qutebrowser/commands/runners.py +++ b/qutebrowser/commands/runners.py @@ -32,7 +32,7 @@ from qutebrowser.config import config from qutebrowser.commands import cmdexc from qutebrowser.utils import message, objreg, qtutils, usertypes, utils from qutebrowser.misc import split, objects -from qutebrowser.keyinput import macros +from qutebrowser.keyinput import macros, modeman if typing.TYPE_CHECKING: from qutebrowser.mainwindow import tabbedbrowser @@ -353,8 +353,7 @@ class CommandRunner(AbstractCommandRunner): record_last_command = True record_macro = True - mode_manager = objreg.get('mode-manager', scope='window', - window=self._win_id) + mode_manager = modeman.instance(self._win_id) cur_mode = mode_manager.mode parsed = None |