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

Merge remote-tracking branch 'origin/pr/3561'

Browse Source
This commit is contained in:
Florian Bruhin 2018-02-12 22:18:49 +01:00
commit 1913012c8a
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/config/configexc.py
View File

@ -92,6 +92,10 @@ class ConfigErrorDesc:
traceback = attr.ib(None) traceback = attr.ib(None)
def __str__(self): def __str__(self):
if self.traceback:
return '{} - {}: {}'.format(self.text,
self.exception.__class__.__name__,
self.exception)
return '{}: {}'.format(self.text, self.exception) return '{}: {}'.format(self.text, self.exception)
def with_text(self, text): def with_text(self, text):

2
qutebrowser/config/configfiles.py
View File

@ -419,7 +419,7 @@ def read_config_py(filename, raising=False):
desc = configexc.ConfigErrorDesc("Error while compiling", e) desc = configexc.ConfigErrorDesc("Error while compiling", e)
raise configexc.ConfigFileErrors(basename, [desc]) raise configexc.ConfigFileErrors(basename, [desc])
except SyntaxError as e: except SyntaxError as e:
desc = configexc.ConfigErrorDesc("Syntax Error", e, desc = configexc.ConfigErrorDesc("Unhandled exception", e,
traceback=traceback.format_exc()) traceback=traceback.format_exc())
raise configexc.ConfigFileErrors(basename, [desc]) raise configexc.ConfigFileErrors(basename, [desc])

12
tests/unit/config/test_configcommands.py
View File

@ -309,6 +309,18 @@ class TestSource:
" While setting 'foo': No option 'foo'") " While setting 'foo': No option 'foo'")
assert str(excinfo.value) == expected assert str(excinfo.value) == expected
def test_invalid_source(self, commands, config_tmpdir):
pyfile = config_tmpdir / 'config.py'
pyfile.write_text('1/0', encoding='utf-8')
with pytest.raises(cmdexc.CommandError) as excinfo:
commands.config_source()
expected = ("Errors occurred while reading config.py:\n"
" Unhandled exception - ZeroDivisionError:"
" division by zero")
assert str(excinfo.value) == expected
class TestEdit: class TestEdit:

2
tests/unit/config/test_configexc.py
View File

@ -74,7 +74,7 @@ def test_config_file_errors_str(errors):
assert str(errors).splitlines() == [ assert str(errors).splitlines() == [
'Errors occurred while reading config.py:', 'Errors occurred while reading config.py:',
' Error text 1: Exception 1', ' Error text 1: Exception 1',
' Error text 2: Exception 2', ' Error text 2 - Exception: Exception 2',
] ]

2
tests/unit/config/test_configfiles.py
View File

@ -550,7 +550,7 @@ class TestConfigPy:
assert len(excinfo.value.errors) == 1 assert len(excinfo.value.errors) == 1
error = excinfo.value.errors[0] error = excinfo.value.errors[0]
assert isinstance(error.exception, SyntaxError) assert isinstance(error.exception, SyntaxError)
assert error.text == "Syntax Error" assert error.text == "Unhandled exception"
exception_text = 'invalid syntax (config.py, line 1)' exception_text = 'invalid syntax (config.py, line 1)'
assert str(error.exception) == exception_text assert str(error.exception) == exception_text