jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-23 09:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update error message (#48)

Browse Source
This commit is contained in:
Pascal Vizeli 2017-05-15 00:08:15 +02:00 committed by GitHub
parent 86180ddc34
commit 237ee0363d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hassio/addons/validate.py
View File

@ -70,10 +70,10 @@ def validate_options(raw_schema):
try: try:
if isinstance(typ, list): if isinstance(typ, list):
# nested value # nested value
options[key] = _nested_validate(typ[0], value) options[key] = _nested_validate(typ[0], value, key)
else: else:
# normal value # normal value
options[key] = _single_validate(typ, value) options[key] = _single_validate(typ, value, key)
except (IndexError, KeyError): except (IndexError, KeyError):
raise vol.Invalid( raise vol.Invalid(
"Type error for {}.".format(key)) from None "Type error for {}.".format(key)) from None
@ -84,12 +84,12 @@ def validate_options(raw_schema):
# pylint: disable=no-value-for-parameter # pylint: disable=no-value-for-parameter
def _single_validate(typ, value): def _single_validate(typ, value, key):
"""Validate a single element.""" """Validate a single element."""
try: try:
# if required argument # if required argument
if value is None: if value is None:
raise vol.Invalid("A required argument is not set!") raise vol.Invalid("Missing required option '{}'.".format(key))
if typ == V_STR: if typ == V_STR:
return str(value) return str(value)
@ -104,13 +104,13 @@ def _single_validate(typ, value):
elif typ == V_URL: elif typ == V_URL:
return vol.Url()(value) return vol.Url()(value)
raise vol.Invalid("Fatal error for {}.".format(value)) raise vol.Invalid("Fatal error for {} type {}.".format(key, typ))
except ValueError: except ValueError:
raise vol.Invalid( raise vol.Invalid(
"Type {} error for {}.".format(typ, value)) from None "Type {} error for '{}' on {}.".format(typ, value, key)) from None
def _nested_validate(typ, data_list): def _nested_validate(typ, data_list, key):
"""Validate nested items.""" """Validate nested items."""
options = [] options = []
@ -123,10 +123,10 @@ def _nested_validate(typ, data_list):
raise vol.Invalid( raise vol.Invalid(
"Unknown nested options {}.".format(c_key)) "Unknown nested options {}.".format(c_key))
c_options[c_key] = _single_validate(typ[c_key], c_value) c_options[c_key] = _single_validate(typ[c_key], c_value, c_key)
options.append(c_options) options.append(c_options)
# normal list # normal list
else: else:
options.append(_single_validate(typ, element)) options.append(_single_validate(typ, element, key))
return options return options