Use modeman.instance() to get mode manager

See #640

5 files changed, 9 insertions, 9 deletions

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 7757a2c20..2c95116f4 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -71,7 +71,7 @@ from qutebrowser.browser.network import proxy
 from qutebrowser.browser.webkit import cookies, cache
 from qutebrowser.browser.webkit.network import networkmanager
 from qutebrowser.extensions import loader
-from qutebrowser.keyinput import macros
+from qutebrowser.keyinput import macros, modeman
 from qutebrowser.mainwindow import mainwindow, prompt
 from qutebrowser.misc import (readline, ipc, savemanager, sessions,
                               crashsignal, earlyinit, sql, cmdhistory,
@@ -880,7 +880,7 @@ class EventFilter(QObject):
             # event through.
             return False
         try:
-            man = objreg.get('mode-manager', scope='window', window='current')
+            man = modeman.instance('current')
             return man.handle_event(event)
         except objreg.RegistryUnavailableError:
             # No window available yet, or not a MainWindow
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
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index c3ba7c942..8b860da90 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -169,7 +169,7 @@ def init(win_id: int, parent: QObject) -> 'ModeManager':
     return modeman
 
 
-def instance(win_id: int) -> 'ModeManager':
+def instance(win_id: typing.Union[int, str]) -> 'ModeManager':
     """Get a modemanager object."""
     return objreg.get('mode-manager', scope='window', window=win_id)
 
diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py
index 1811142d7..42456159a 100644
--- a/qutebrowser/misc/utilcmds.py
+++ b/qutebrowser/misc/utilcmds.py
@@ -30,6 +30,7 @@ from PyQt5.QtWidgets import QApplication
 
 from qutebrowser.browser import qutescheme
 from qutebrowser.utils import log, objreg, usertypes, message, debug, utils
+from qutebrowser.keyinput import modeman
 from qutebrowser.commands import runners
 from qutebrowser.api import cmdutils
 from qutebrowser.misc import (  # pylint: disable=unused-import
@@ -201,7 +202,7 @@ def repeat_command(win_id: int, count: int = None) -> None:
     Args:
         count: Which count to pass the command.
     """
-    mode_manager = objreg.get('mode-manager', scope='window', window=win_id)
+    mode_manager = modeman.instance(win_id)
     if mode_manager.mode not in runners.last_command:
         raise cmdutils.CommandError("You didn't do anything yet.")
     cmd = runners.last_command[mode_manager.mode]