Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-01-01 10:21:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix entity name validation to allow "Off" and "On" (#7821)

Browse source
This commit is contained in:
Jesse Hills 2024-11-26 22:50:16 +13:00 committed by GitHub
parent 841d278224
commit 6e50e2aa65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
esphome/config_validation.py
View file

@ -1839,8 +1839,6 @@ def validate_registry_entry(name, registry):
def none(value): def none(value):
if value in ("none", "None"): if value in ("none", "None"):
return None return None
if boolean(value) is False:
return None
raise Invalid("Must be none") raise Invalid("Must be none")
@ -1912,17 +1910,23 @@ MQTT_COMMAND_COMPONENT_SCHEMA = MQTT_COMPONENT_SCHEMA.extend(
} }
) )
ENTITY_BASE_SCHEMA = Schema(
{ def _validate_entity_name(value):
Optional(CONF_NAME): Any( value = string(value)
All( try:
none, value = none(value) # pylint: disable=assignment-from-none
except Invalid:
pass
else:
requires_friendly_name( requires_friendly_name(
"Name cannot be None when esphome->friendly_name is not set!" "Name cannot be None when esphome->friendly_name is not set!"
), )(value)
), return value
string,
),
ENTITY_BASE_SCHEMA = Schema(
{
Optional(CONF_NAME): _validate_entity_name,
Optional(CONF_INTERNAL): boolean, Optional(CONF_INTERNAL): boolean,
Optional(CONF_DISABLED_BY_DEFAULT, default=False): boolean, Optional(CONF_DISABLED_BY_DEFAULT, default=False): boolean,
Optional(CONF_ICON): icon, Optional(CONF_ICON): icon,