Revert back to objreg to avoid circular import

This commit is contained in:
Jan Verbeek 2016-11-09 19:07:56 +01:00
parent f1c3bc89ec
commit a778b7184c

View File

@ -27,7 +27,6 @@ from PyQt5.QtCore import pyqtSlot, QUrl, QObject
from qutebrowser.config import config, configexc from qutebrowser.config import config, configexc
from qutebrowser.commands import cmdexc, cmdutils from qutebrowser.commands import cmdexc, cmdutils
from qutebrowser.keyinput import modeman
from qutebrowser.utils import message, objreg, qtutils, usertypes, utils from qutebrowser.utils import message, objreg, qtutils, usertypes, utils
from qutebrowser.misc import split from qutebrowser.misc import split
@ -263,7 +262,8 @@ class CommandRunner(QObject):
record_last_command = True record_last_command = True
record_macro = True record_macro = True
mode_manager = modeman.instance(self._win_id) mode_manager = objreg.get('mode-manager', scope='window',
window=self._win_id)
cur_mode = mode_manager.mode cur_mode = mode_manager.mode
for result in self.parse_all(text): for result in self.parse_all(text):