rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve exception handling for :bind/:unbind

Browse Source
This commit is contained in:
Florian Bruhin 2017-06-19 18:15:00 +02:00
parent ba1bc29a97
commit f434f955c2
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qutebrowser/config/config.py
View File

@ -143,7 +143,7 @@ class NewKeyConfig:
def _prepare(self, key, mode): def _prepare(self, key, mode):
"""Make sure the given mode exists and normalize the key.""" """Make sure the given mode exists and normalize the key."""
if mode not in val.bindings.commands: if mode not in val.bindings.commands:
raise configexc.ValidationError( raise configexc.KeybindingError(
"Invalid mode {} while binding {}!".format(mode, key)) "Invalid mode {} while binding {}!".format(mode, key))
if utils.is_special_key(key): if utils.is_special_key(key):
# <Ctrl-t>, <ctrl-T>, and <ctrl-t> should be considered equivalent # <Ctrl-t>, <ctrl-T>, and <ctrl-t> should be considered equivalent
@ -159,21 +159,21 @@ class NewKeyConfig:
results = parser.parse_all(command) results = parser.parse_all(command)
except cmdexc.Error as e: except cmdexc.Error as e:
# FIXME: conf good message? # FIXME: conf good message?
raise configexc.ValidationError("Invalid command: {}".format(e)) raise configexc.KeybindingError("Invalid command: {}".format(e))
for result in results: for result in results:
try: try:
result.cmd.validate_mode(usertypes.KeyMode[mode]) result.cmd.validate_mode(usertypes.KeyMode[mode])
except cmdexc.PrerequisitesError as e: except cmdexc.PrerequisitesError as e:
# FIXME: conf good message? # FIXME: conf good message?
raise configexc.ValidationError(str(e)) raise configexc.KeybindingError(str(e))
bindings = val.bindings.commands bindings = val.bindings.commands
log.keyboard.vdebug("Adding binding {} -> {} in mode {}.".format( log.keyboard.vdebug("Adding binding {} -> {} in mode {}.".format(
key, command, mode)) key, command, mode))
if key in bindings[mode] and not force: if key in bindings[mode] and not force:
raise configexc.DuplicateKeyError("Duplicate key {}".format(key)) raise configexc.DuplicateKeyError(key)
bindings[mode][key] = command bindings[mode][key] = command
val.bindings.commands = bindings # FIXME:conf val.bindings.commands = bindings # FIXME:conf
@ -183,7 +183,7 @@ class NewKeyConfig:
try: try:
del val.bindings.commands[mode][key] del val.bindings.commands[mode][key]
except KeyError: except KeyError:
raise configexc.ValidationError("Unknown binding {}".format(key)) raise configexc.KeybindingError("Unknown binding {}".format(key))
val.bindings.commands = val.bindings.commands # FIXME:conf val.bindings.commands = val.bindings.commands # FIXME:conf
def get_command(self, key, mode): def get_command(self, key, mode):
@ -314,7 +314,7 @@ class ConfigCommands:
key_instance.bind(key, command, mode=mode, force=force) key_instance.bind(key, command, mode=mode, force=force)
except configexc.DuplicateKeyError as e: except configexc.DuplicateKeyError as e:
raise cmdexc.CommandError(str(e) + " - use --force to override!") raise cmdexc.CommandError(str(e) + " - use --force to override!")
except configexc.ValidationError as e: except configexc.KeybindingError as e:
raise cmdexc.CommandError(str(e)) raise cmdexc.CommandError(str(e))
@cmdutils.register(instance='config-commands') @cmdutils.register(instance='config-commands')
@ -327,7 +327,7 @@ class ConfigCommands:
""" """
try: try:
key_instance.unbind(key, mode=mode) key_instance.unbind(key, mode=mode)
except configexc.ValidationError as e: except configexc.KeybindingError as e:
raise cmdexc.CommandError(str(e)) raise cmdexc.CommandError(str(e))

10
qutebrowser/config/configexc.py
View File

@ -52,11 +52,17 @@ class ValidationError(Error):
self.option = None self.option = None
class DuplicateKeyError(ValidationError): class KeybindingError(Error):
"""Raised for issues with keybindings."""
class DuplicateKeyError(KeybindingError):
"""Raised when there was a duplicate key.""" """Raised when there was a duplicate key."""
pass def __init__(self, key):
super().__init__("Duplicate key {}".format(key))
class NoOptionError(Error): class NoOptionError(Error):