This commit is contained in:
Florian Bruhin 2014-04-24 22:49:06 +02:00
parent 581b715b42
commit 0def82fe8c
9 changed files with 10 additions and 17 deletions

View File

@ -58,8 +58,8 @@ from qutebrowser.widgets.mainwindow import MainWindow
from qutebrowser.widgets.crash import CrashDialog from qutebrowser.widgets.crash import CrashDialog
from qutebrowser.keyinput.normalmode import CommandKeyParser from qutebrowser.keyinput.normalmode import CommandKeyParser
from qutebrowser.keyinput.insertmode import InsertKeyParser from qutebrowser.keyinput.insertmode import InsertKeyParser
from qutebrowser.keyinput.hintmode import HintKeyParser
from qutebrowser.commands.parsers import CommandParser, SearchParser from qutebrowser.commands.parsers import CommandParser, SearchParser
from qutebrowser.browser.hints import HintKeyParser
from qutebrowser.utils.appdirs import AppDirs from qutebrowser.utils.appdirs import AppDirs
from qutebrowser.utils.misc import dotted_getattr from qutebrowser.utils.misc import dotted_getattr
from qutebrowser.utils.debug import set_trace # pylint: disable=unused-import from qutebrowser.utils.debug import set_trace # pylint: disable=unused-import

View File

@ -30,7 +30,6 @@ import qutebrowser.keyinput.modes as modes
import qutebrowser.utils.message as message import qutebrowser.utils.message as message
import qutebrowser.utils.url as urlutils import qutebrowser.utils.url as urlutils
import qutebrowser.utils.webelem as webelem import qutebrowser.utils.webelem as webelem
from qutebrowser.keyinput.hintmode import HintKeyParser
ElemTuple = namedtuple('ElemTuple', 'elem, label') ElemTuple = namedtuple('ElemTuple', 'elem, label')

View File

@ -545,7 +545,7 @@ class KeyBinding(Command):
""" """
def __init__(self, special_keys=None): def __init__(self, special_keys=None):
if special_keys == None: if special_keys is None:
special_keys = [] special_keys = []
self._special_keys = special_keys self._special_keys = special_keys

View File

@ -52,7 +52,7 @@ class HintKeyParser(KeyParser):
return True return True
return False return False
def execute(self, cmdstr, count=None): def execute(self, cmdstr, _count=None):
"""Handle a completed keychain. """Handle a completed keychain.
Emit: Emit:

View File

@ -17,8 +17,6 @@
"""KeyParser for "insert" mode.""" """KeyParser for "insert" mode."""
from PyQt5.QtCore import pyqtSignal, Qt
import qutebrowser.keyinput.modes as modes import qutebrowser.keyinput.modes as modes
from qutebrowser.keyinput.keyparser import KeyParser from qutebrowser.keyinput.keyparser import KeyParser
@ -31,7 +29,7 @@ class InsertKeyParser(KeyParser):
super().__init__(parent, supports_chains=False) super().__init__(parent, supports_chains=False)
self.read_config('keybind.insert') self.read_config('keybind.insert')
def execute(self, cmdstr, count=None): def execute(self, cmdstr, _count=None):
"""Handle a completed keychain.""" """Handle a completed keychain."""
if cmdstr == '<leave>': if cmdstr == '<leave>':
modes.leave("insert") modes.leave("insert")

View File

@ -321,9 +321,9 @@ class KeyParser(QObject):
logging.debug("registered key: {} -> {}".format(key, cmd)) logging.debug("registered key: {} -> {}".format(key, cmd))
self.bindings[key] = cmd self.bindings[key] = cmd
else: else:
logging.warn("Ignoring keychain \"{}\" in section \"{}\" " logging.warn(
"because keychains are not supported there.".format( "Ignoring keychain \"{}\" in section \"{}\" because "
key, sectname)) "keychains are not supported there.".format(key, sectname))
@pyqtSlot(str, str) @pyqtSlot(str, str)
def on_config_changed(self, section, _option): def on_config_changed(self, section, _option):

View File

@ -190,10 +190,8 @@ class ModeManager(QObject):
handled = handler(evt) handled = handler(evt)
else: else:
handled = False handled = False
if handled: if handled or not self._forward_unbound_keys:
return True return True
elif self._forward_unbound_keys:
return False
else: else:
return True return True
else: else:

View File

@ -23,8 +23,6 @@ Module attributes:
import logging import logging
from PyQt5.QtCore import pyqtSignal
import qutebrowser.utils.message as message import qutebrowser.utils.message as message
from qutebrowser.keyinput.keyparser import KeyParser from qutebrowser.keyinput.keyparser import KeyParser
from qutebrowser.commands.parsers import (CommandParser, ArgumentCountError, from qutebrowser.commands.parsers import (CommandParser, ArgumentCountError,

View File

@ -57,9 +57,9 @@ def clear():
bridge.text.emit('') bridge.text.emit('')
def set_cmd_text(text): def set_cmd_text(txt):
"""Set the statusbar command line to a preset text.""" """Set the statusbar command line to a preset text."""
bridge.set_cmd_text.emit(text) bridge.set_cmd_text.emit(txt)
class MessageBridge(QObject): class MessageBridge(QObject):