address requested changes

- add INPUT_MODES & PROMPT_MODES constants in modeman
- use those in tabbedbrowser and modeman
- fix debug logs format to be more human readable
- fix associated tests for new debug logs

1 files changed, 8 insertions, 8 deletions

diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index 3f706d43c..4e9d78fb0 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -30,6 +30,9 @@ from qutebrowser.config import config
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.utils import usertypes, log, objreg, utils
 
+INPUT_MODES = [usertypes.KeyMode.insert, usertypes.KeyMode.passthrough]
+PROMPT_MODES = [usertypes.KeyMode.prompt, usertypes.KeyMode.yesno]
+
 
 @attr.s(frozen=True)
 class KeyEvent:
@@ -115,7 +118,7 @@ class ModeManager(QObject):
     Attributes:
         mode: The mode we're currently in.
         _win_id: The window ID of this ModeManager
-        _prev_mode: mode before a prompt poped up
+        _prev_mode: Mode before a prompt popped up
         _parsers: A dictionary of modes and their keyparsers.
         _forward_unbound_keys: If we should forward unbound keys.
         _releaseevents_to_pass: A set of KeyEvents where the keyPressEvent was
@@ -235,10 +238,8 @@ class ModeManager(QObject):
             mode, '' if reason is None else ' (reason: {})'.format(reason)))
         if mode not in self._parsers:
             raise ValueError("No keyparser for mode {}".format(mode))
-        prompt_modes = (usertypes.KeyMode.prompt, usertypes.KeyMode.yesno)
-        input_modes = [usertypes.KeyMode.insert, usertypes.KeyMode.passthrough]
-        if self.mode == mode or (self.mode in prompt_modes and
-                                 mode in prompt_modes):
+        if self.mode == mode or (self.mode in PROMPT_MODES and
+                                 mode in PROMPT_MODES):
             log.modes.debug("Ignoring request as we're in mode {} "
                             "already.".format(self.mode))
             return
@@ -250,9 +251,8 @@ class ModeManager(QObject):
                 return
             log.modes.debug("Overriding mode {}.".format(self.mode))
             self.left.emit(self.mode, mode, self._win_id)
-        if (mode in prompt_modes and self.mode in input_modes and
+        if (mode in PROMPT_MODES and self.mode in INPUT_MODES and
                 config.val.tabs.mode_on_change == 'restore'):
-            # save previous mode when being prompted
             self._prev_mode = self.mode
         else:
             self._prev_mode = usertypes.KeyMode.normal
@@ -303,7 +303,7 @@ class ModeManager(QObject):
         self.clear_keychain()
         self.mode = usertypes.KeyMode.normal
         self.left.emit(mode, self.mode, self._win_id)
-        if mode in [usertypes.KeyMode.prompt, usertypes.KeyMode.yesno]:
+        if mode in PROMPT_MODES:
             self.enter(self._prev_mode,
                        reason='restore mode before {}'.format(mode.name))