github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed error message, closes #1816

Browse source
This commit is contained in:
Simon Willison 2022-09-19 18:15:40 -07:00
commit cb1e093fd3
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
datasette/app.py
View file

@ -295,7 +295,9 @@ class Datasette:
# Validate those settings
for key in settings:
if key not in DEFAULT_SETTINGS:
raise StartupError("Invalid setting '{key}' in settings.json")
raise StartupError(
"Invalid setting '{}' in settings.json".format(key)
)
self._settings = dict(DEFAULT_SETTINGS, **(settings or {}))
self.renderers = {} # File extension -> (renderer, can_render) functions
self.version_note = version_note

3
tests/test_config_dir.py
View file

@ -86,8 +86,9 @@ def test_invalid_settings(config_dir):
json.dumps({"invalid": "invalid-setting"}), "utf-8"
)
try:
with pytest.raises(StartupError):
with pytest.raises(StartupError) as ex:
ds = Datasette([], config_dir=config_dir)
assert ex.value.args[0] == "Invalid setting 'invalid' in settings.json"
finally:
(config_dir / "settings.json").write_text(previous, "utf-8")