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

Fix display of errors while reading the key config file

Browse Source 
Also catch `cmdexc.CommandError` on startup to show these errors in the
alert dialog on startup.

Fixes #1340
This commit is contained in:
Martin Tournoij 2017-04-04 09:50:12 +01:00
parent 0de3b5460e
commit c5427a0127
No known key found for this signature in database
GPG Key ID: A6258419189EE585
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qutebrowser/config/config.py
View File

@ -186,7 +186,8 @@ def _init_key_config(parent):
key_config = keyconf.KeyConfigParser(standarddir.config(), 'keys.conf', key_config = keyconf.KeyConfigParser(standarddir.config(), 'keys.conf',
args.relaxed_config, args.relaxed_config,
parent=parent) parent=parent)
except (keyconf.KeyConfigError, UnicodeDecodeError) as e: except (keyconf.KeyConfigError, cmdexc.CommandError,
UnicodeDecodeError) as e:
log.init.exception(e) log.init.exception(e)
errstr = "Error while reading key config:\n" errstr = "Error while reading key config:\n"
if e.lineno is not None: if e.lineno is not None:

2
qutebrowser/config/parsers/keyconf.py
View File

@ -322,7 +322,7 @@ class KeyConfigParser(QObject):
else: else:
line = line.strip() line = line.strip()
self._read_command(line) self._read_command(line)
except KeyConfigError as e: except (KeyConfigError, cmdexc.CommandError) as e:
if relaxed: if relaxed:
continue continue
else: else: