sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

allow default option for typed_schema (#1700)

Browse Source 
Co-authored-by: Otto Winter <otto@otto-winter.com>
This commit is contained in:
wifwucite
2021-05-23 22:24:24 +02:00
committed by GitHub
parent 0ce57e5a39
commit 8d8d421286
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
esphome/config_validation.py
View File

@@ -1363,15 +1363,17 @@ def extract_keys(schema):
def typed_schema(schemas, **kwargs): def typed_schema(schemas, **kwargs):
"""Create a schema that has a key to distinguish between schemas""" """Create a schema that has a key to distinguish between schemas"""
key = kwargs.pop("key", CONF_TYPE) key = kwargs.pop("key", CONF_TYPE)
default_schema_option = kwargs.pop("default_type", None)
key_validator = one_of(*schemas, **kwargs) key_validator = one_of(*schemas, **kwargs)
def validator(value): def validator(value):
if not isinstance(value, dict): if not isinstance(value, dict):
raise Invalid("Value must be dict") raise Invalid("Value must be dict")
if key not in value:
raise Invalid("type not specified!")
value = value.copy() value = value.copy()
key_v = key_validator(value.pop(key)) schema_option = value.pop(key, default_schema_option)
if schema_option is None:
raise Invalid(key + " not specified!")
key_v = key_validator(schema_option)
value = schemas[key_v](value) value = schemas[key_v](value)
value[key] = key_v value[key] = key_v
return value return value