diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 2e29c9b31..9b8c9f7d5 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -452,14 +452,14 @@ class CommandDispatcher: hintmanager = objreg.get('hintmanager', scope='tab') if where == 'prev': hintmanager.follow_prevnext(frame, url, prev=True, tab=tab, - background=background, window=window) + background=bg, window=window) elif where == 'next': hintmanager.follow_prevnext(frame, url, prev=False, tab=tab, - background=background, window=window) + background=bg, window=window) elif where == 'up': - self._navigate_up(url, tab, background, window) + self._navigate_up(url, tab, bg, window) elif where in ('decrement', 'increment'): - self._navigate_incdec(url, where, tab, background, window) + self._navigate_incdec(url, where, tab, bg, window) else: raise ValueError("Got called with invalid value {} for " "`where'.".format(where)) diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py index 8b91cfcfe..17dc2f8f2 100644 --- a/qutebrowser/commands/command.py +++ b/qutebrowser/commands/command.py @@ -366,7 +366,7 @@ class Command: value = self._type_conv[param.name](value) return name, value - def _get_call_args(self, win_id): + def _get_call_args(self, win_id): # noqa """Get arguments for a function call. Args: diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py index 592948b7e..29505f04d 100644 --- a/qutebrowser/keyinput/modeparsers.py +++ b/qutebrowser/keyinput/modeparsers.py @@ -168,7 +168,7 @@ class HintKeyParser(keyparser.CommandKeyParser): raise TypeError("Type {} is no Type member!".format(keytype)) if keytype == self.Type.chain: hintmanager = objreg.get('hintmanager', scope='tab', - window=self._win_id, tab='current') + window=self._win_id, tab='current') hintmanager.fire(cmdstr) else: # execute as command diff --git a/qutebrowser/utils/objreg.py b/qutebrowser/utils/objreg.py index 2cb3f0cb9..d6dca188f 100644 --- a/qutebrowser/utils/objreg.py +++ b/qutebrowser/utils/objreg.py @@ -151,7 +151,7 @@ def _get_registry(scope, window=None, tab=None): """Get the correct registry for a given scope.""" if window is not None and scope not in ('window', 'tab'): raise TypeError("window is set with scope {}".format(scope)) - if tab is not None and scope != 'tab': + if tab is not None and scope != 'tab': raise TypeError("tab is set with scope {}".format(scope)) if scope == 'global': return global_registry @@ -229,4 +229,3 @@ def dump_objects(): for line in data: lines.append(" {}".format(line)) return lines -