evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disallow list/dict for string configuration (#17202)

Browse source
This commit is contained in:
Anders Melchiorsen 2018-10-07 12:35:44 +02:00 • committed by Paulus Schoutsen
parent c8266c6692
commit 6e81ae096e
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/helpers/config_validation.py
View file

@ -335,9 +335,12 @@ def slugify(value):
def string(value: Any) -> str: def string(value: Any) -> str:
"""Coerce value to string, except for None.""" """Coerce value to string, except for None."""
if value is not None: if value is None:
return str(value) raise vol.Invalid('string value is None')
raise vol.Invalid('string value is None') if isinstance(value, (list, dict)):
raise vol.Invalid('value should be a string')
return str(value)
def temperature_unit(value) -> str: def temperature_unit(value) -> str:

8
tests/helpers/test_config_validation.py
View file

@ -356,9 +356,15 @@ def test_string():
"""Test string validation.""" """Test string validation."""
schema = vol.Schema(cv.string) schema = vol.Schema(cv.string)
with pytest.raises(vol.MultipleInvalid): with pytest.raises(vol.Invalid):
schema(None) schema(None)
with pytest.raises(vol.Invalid):
schema([])
with pytest.raises(vol.Invalid):
schema({})
for value in (True, 1, 'hello'): for value in (True, 1, 'hello'):
schema(value) schema(value)