From 0def82fe8c554fce22b85953a14d4105abc2105c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 24 Apr 2014 22:49:06 +0200 Subject: [PATCH] Fix lint --- qutebrowser/app.py | 2 +- qutebrowser/browser/hints.py | 1 - qutebrowser/config/conftypes.py | 2 +- qutebrowser/keyinput/hintmode.py | 2 +- qutebrowser/keyinput/insertmode.py | 4 +--- qutebrowser/keyinput/keyparser.py | 6 +++--- qutebrowser/keyinput/modes.py | 4 +--- qutebrowser/keyinput/normalmode.py | 2 -- qutebrowser/utils/message.py | 4 ++-- 9 files changed, 10 insertions(+), 17 deletions(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index bfb555385..292890f37 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -58,8 +58,8 @@ from qutebrowser.widgets.mainwindow import MainWindow from qutebrowser.widgets.crash import CrashDialog from qutebrowser.keyinput.normalmode import CommandKeyParser from qutebrowser.keyinput.insertmode import InsertKeyParser +from qutebrowser.keyinput.hintmode import HintKeyParser from qutebrowser.commands.parsers import CommandParser, SearchParser -from qutebrowser.browser.hints import HintKeyParser from qutebrowser.utils.appdirs import AppDirs from qutebrowser.utils.misc import dotted_getattr from qutebrowser.utils.debug import set_trace # pylint: disable=unused-import diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index e0d2e5147..58f36e295 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -30,7 +30,6 @@ import qutebrowser.keyinput.modes as modes import qutebrowser.utils.message as message import qutebrowser.utils.url as urlutils import qutebrowser.utils.webelem as webelem -from qutebrowser.keyinput.hintmode import HintKeyParser ElemTuple = namedtuple('ElemTuple', 'elem, label') diff --git a/qutebrowser/config/conftypes.py b/qutebrowser/config/conftypes.py index 5694cfa03..afee10b86 100644 --- a/qutebrowser/config/conftypes.py +++ b/qutebrowser/config/conftypes.py @@ -545,7 +545,7 @@ class KeyBinding(Command): """ def __init__(self, special_keys=None): - if special_keys == None: + if special_keys is None: special_keys = [] self._special_keys = special_keys diff --git a/qutebrowser/keyinput/hintmode.py b/qutebrowser/keyinput/hintmode.py index 4bf3a06e9..60ff8f3bb 100644 --- a/qutebrowser/keyinput/hintmode.py +++ b/qutebrowser/keyinput/hintmode.py @@ -52,7 +52,7 @@ class HintKeyParser(KeyParser): return True return False - def execute(self, cmdstr, count=None): + def execute(self, cmdstr, _count=None): """Handle a completed keychain. Emit: diff --git a/qutebrowser/keyinput/insertmode.py b/qutebrowser/keyinput/insertmode.py index 660891b74..c429b045a 100644 --- a/qutebrowser/keyinput/insertmode.py +++ b/qutebrowser/keyinput/insertmode.py @@ -17,8 +17,6 @@ """KeyParser for "insert" mode.""" -from PyQt5.QtCore import pyqtSignal, Qt - import qutebrowser.keyinput.modes as modes from qutebrowser.keyinput.keyparser import KeyParser @@ -31,7 +29,7 @@ class InsertKeyParser(KeyParser): super().__init__(parent, supports_chains=False) self.read_config('keybind.insert') - def execute(self, cmdstr, count=None): + def execute(self, cmdstr, _count=None): """Handle a completed keychain.""" if cmdstr == '': modes.leave("insert") diff --git a/qutebrowser/keyinput/keyparser.py b/qutebrowser/keyinput/keyparser.py index 2fd901cd1..9c1b0181f 100644 --- a/qutebrowser/keyinput/keyparser.py +++ b/qutebrowser/keyinput/keyparser.py @@ -321,9 +321,9 @@ class KeyParser(QObject): logging.debug("registered key: {} -> {}".format(key, cmd)) self.bindings[key] = cmd else: - logging.warn("Ignoring keychain \"{}\" in section \"{}\" " - "because keychains are not supported there.".format( - key, sectname)) + logging.warn( + "Ignoring keychain \"{}\" in section \"{}\" because " + "keychains are not supported there.".format(key, sectname)) @pyqtSlot(str, str) def on_config_changed(self, section, _option): diff --git a/qutebrowser/keyinput/modes.py b/qutebrowser/keyinput/modes.py index 40d2e229f..e293edc5f 100644 --- a/qutebrowser/keyinput/modes.py +++ b/qutebrowser/keyinput/modes.py @@ -190,10 +190,8 @@ class ModeManager(QObject): handled = handler(evt) else: handled = False - if handled: + if handled or not self._forward_unbound_keys: return True - elif self._forward_unbound_keys: - return False else: return True else: diff --git a/qutebrowser/keyinput/normalmode.py b/qutebrowser/keyinput/normalmode.py index 846edb216..bf6207b4f 100644 --- a/qutebrowser/keyinput/normalmode.py +++ b/qutebrowser/keyinput/normalmode.py @@ -23,8 +23,6 @@ Module attributes: import logging -from PyQt5.QtCore import pyqtSignal - import qutebrowser.utils.message as message from qutebrowser.keyinput.keyparser import KeyParser from qutebrowser.commands.parsers import (CommandParser, ArgumentCountError, diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py index 293e5acb6..c5b9a8619 100644 --- a/qutebrowser/utils/message.py +++ b/qutebrowser/utils/message.py @@ -57,9 +57,9 @@ def clear(): bridge.text.emit('') -def set_cmd_text(text): +def set_cmd_text(txt): """Set the statusbar command line to a preset text.""" - bridge.set_cmd_text.emit(text) + bridge.set_cmd_text.emit(txt) class MessageBridge(QObject):