Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2026-05-08 17:49:37 +01:00
Code Activity

Rename DOMAIN_xxx aliases in template (#163259)

Browse Source
This commit is contained in:
epenet
2026-02-17 14:34:48 +01:00
committed by GitHub
parent 98b8e152e3
commit 637accbfff
2 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
homeassistant/components/template/config.py
+37 -37
View File
@@ -9,27 +9,27 @@ from typing import Any
import voluptuous as vol
from homeassistant.components.alarm_control_panel import (
DOMAIN as DOMAIN_ALARM_CONTROL_PANEL,
DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
)
from homeassistant.components.binary_sensor import DOMAIN as DOMAIN_BINARY_SENSOR
from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
from homeassistant.components.blueprint import (
is_blueprint_instance_config,
schemas as blueprint_schemas,
)
from homeassistant.components.button import DOMAIN as DOMAIN_BUTTON
from homeassistant.components.cover import DOMAIN as DOMAIN_COVER
from homeassistant.components.event import DOMAIN as DOMAIN_EVENT
from homeassistant.components.fan import DOMAIN as DOMAIN_FAN
from homeassistant.components.image import DOMAIN as DOMAIN_IMAGE
from homeassistant.components.light import DOMAIN as DOMAIN_LIGHT
from homeassistant.components.lock import DOMAIN as DOMAIN_LOCK
from homeassistant.components.number import DOMAIN as DOMAIN_NUMBER
from homeassistant.components.select import DOMAIN as DOMAIN_SELECT
from homeassistant.components.sensor import DOMAIN as DOMAIN_SENSOR
from homeassistant.components.switch import DOMAIN as DOMAIN_SWITCH
from homeassistant.components.update import DOMAIN as DOMAIN_UPDATE
from homeassistant.components.vacuum import DOMAIN as DOMAIN_VACUUM
from homeassistant.components.weather import DOMAIN as DOMAIN_WEATHER
from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN
from homeassistant.components.cover import DOMAIN as COVER_DOMAIN
from homeassistant.components.event import DOMAIN as EVENT_DOMAIN
from homeassistant.components.fan import DOMAIN as FAN_DOMAIN
from homeassistant.components.image import DOMAIN as IMAGE_DOMAIN
from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN
from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN
from homeassistant.components.select import DOMAIN as SELECT_DOMAIN
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
from homeassistant.components.update import DOMAIN as UPDATE_DOMAIN
from homeassistant.components.vacuum import DOMAIN as VACUUM_DOMAIN
from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
from homeassistant.config import async_log_schema_error, config_without_domain
from homeassistant.const import (
CONF_ACTION,
@@ -86,8 +86,8 @@ PACKAGE_MERGE_HINT = "list"
def validate_binary_sensor_auto_off_has_trigger(obj: dict) -> dict:
"""Validate that binary sensors with auto_off have triggers."""
if CONF_TRIGGERS not in obj and DOMAIN_BINARY_SENSOR in obj:
binary_sensors: list[ConfigType] = obj[DOMAIN_BINARY_SENSOR]
if CONF_TRIGGERS not in obj and BINARY_SENSOR_DOMAIN in obj:
binary_sensors: list[ConfigType] = obj[BINARY_SENSOR_DOMAIN]
for binary_sensor in binary_sensors:
if binary_sensor_platform.CONF_AUTO_OFF not in binary_sensor:
continue
@@ -192,53 +192,53 @@ CONFIG_SECTION_SCHEMA = vol.All(
vol.Optional(CONF_TRIGGERS): cv.TRIGGER_SCHEMA,
vol.Optional(CONF_UNIQUE_ID): cv.string,
vol.Optional(CONF_VARIABLES): cv.SCRIPT_VARIABLES_SCHEMA,
vol.Optional(DOMAIN_ALARM_CONTROL_PANEL): vol.All(
vol.Optional(ALARM_CONTROL_PANEL_DOMAIN): vol.All(
cv.ensure_list,
[alarm_control_panel_platform.ALARM_CONTROL_PANEL_YAML_SCHEMA],
),
vol.Optional(DOMAIN_BINARY_SENSOR): vol.All(
vol.Optional(BINARY_SENSOR_DOMAIN): vol.All(
cv.ensure_list, [binary_sensor_platform.BINARY_SENSOR_YAML_SCHEMA]
),
vol.Optional(DOMAIN_BUTTON): vol.All(
vol.Optional(BUTTON_DOMAIN): vol.All(
cv.ensure_list, [button_platform.BUTTON_YAML_SCHEMA]
),
vol.Optional(DOMAIN_COVER): vol.All(
vol.Optional(COVER_DOMAIN): vol.All(
cv.ensure_list, [cover_platform.COVER_YAML_SCHEMA]
),
vol.Optional(DOMAIN_EVENT): vol.All(
vol.Optional(EVENT_DOMAIN): vol.All(
cv.ensure_list, [event_platform.EVENT_YAML_SCHEMA]
),
vol.Optional(DOMAIN_FAN): vol.All(
vol.Optional(FAN_DOMAIN): vol.All(
cv.ensure_list, [fan_platform.FAN_YAML_SCHEMA]
),
vol.Optional(DOMAIN_IMAGE): vol.All(
vol.Optional(IMAGE_DOMAIN): vol.All(
cv.ensure_list, [image_platform.IMAGE_YAML_SCHEMA]
),
vol.Optional(DOMAIN_LIGHT): vol.All(
vol.Optional(LIGHT_DOMAIN): vol.All(
cv.ensure_list, [light_platform.LIGHT_YAML_SCHEMA]
),
vol.Optional(DOMAIN_LOCK): vol.All(
vol.Optional(LOCK_DOMAIN): vol.All(
cv.ensure_list, [lock_platform.LOCK_YAML_SCHEMA]
),
vol.Optional(DOMAIN_NUMBER): vol.All(
vol.Optional(NUMBER_DOMAIN): vol.All(
cv.ensure_list, [number_platform.NUMBER_YAML_SCHEMA]
),
vol.Optional(DOMAIN_SELECT): vol.All(
vol.Optional(SELECT_DOMAIN): vol.All(
cv.ensure_list, [select_platform.SELECT_YAML_SCHEMA]
),
vol.Optional(DOMAIN_SENSOR): vol.All(
vol.Optional(SENSOR_DOMAIN): vol.All(
cv.ensure_list, [sensor_platform.SENSOR_YAML_SCHEMA]
),
vol.Optional(DOMAIN_SWITCH): vol.All(
vol.Optional(SWITCH_DOMAIN): vol.All(
cv.ensure_list, [switch_platform.SWITCH_YAML_SCHEMA]
),
vol.Optional(DOMAIN_UPDATE): vol.All(
vol.Optional(UPDATE_DOMAIN): vol.All(
cv.ensure_list, [update_platform.UPDATE_YAML_SCHEMA]
),
vol.Optional(DOMAIN_VACUUM): vol.All(
vol.Optional(VACUUM_DOMAIN): vol.All(
cv.ensure_list, [vacuum_platform.VACUUM_YAML_SCHEMA]
),
vol.Optional(DOMAIN_WEATHER): vol.All(
vol.Optional(WEATHER_DOMAIN): vol.All(
cv.ensure_list,
[
vol.Any(
@@ -250,7 +250,7 @@ CONFIG_SECTION_SCHEMA = vol.All(
},
),
ensure_domains_do_not_have_trigger_or_action(
DOMAIN_BUTTON,
BUTTON_DOMAIN,
),
validate_binary_sensor_auto_off_has_trigger,
)
@@ -382,12 +382,12 @@ async def async_validate_config(hass: HomeAssistant, config: ConfigType) -> Conf
for old_key, new_key, legacy_fields in (
(
CONF_SENSORS,
DOMAIN_SENSOR,
SENSOR_DOMAIN,
sensor_platform.LEGACY_FIELDS,
),
(
CONF_BINARY_SENSORS,
DOMAIN_BINARY_SENSOR,
BINARY_SENSOR_DOMAIN,
binary_sensor_platform.LEGACY_FIELDS,
),
):
tests/components/template/test_blueprint.py
+26 -26
View File
@@ -17,19 +17,19 @@ from homeassistant.components.blueprint import (
)
from homeassistant.components.template import DOMAIN, SERVICE_RELOAD
from homeassistant.components.template.config import (
DOMAIN_ALARM_CONTROL_PANEL,
DOMAIN_BINARY_SENSOR,
DOMAIN_COVER,
DOMAIN_FAN,
DOMAIN_IMAGE,
DOMAIN_LIGHT,
DOMAIN_LOCK,
DOMAIN_NUMBER,
DOMAIN_SELECT,
DOMAIN_SENSOR,
DOMAIN_SWITCH,
DOMAIN_VACUUM,
DOMAIN_WEATHER,
ALARM_CONTROL_PANEL_DOMAIN,
BINARY_SENSOR_DOMAIN,
COVER_DOMAIN,
FAN_DOMAIN,
IMAGE_DOMAIN,
LIGHT_DOMAIN,
LOCK_DOMAIN,
NUMBER_DOMAIN,
SELECT_DOMAIN,
SENSOR_DOMAIN,
SWITCH_DOMAIN,
VACUUM_DOMAIN,
WEATHER_DOMAIN,
)
from homeassistant.const import STATE_ON
from homeassistant.core import Context, HomeAssistant, callback
@@ -564,19 +564,19 @@ async def test_no_blueprint(hass: HomeAssistant) -> None:
@pytest.mark.parametrize(
("domain", "set_state", "expected"),
[
(DOMAIN_ALARM_CONTROL_PANEL, STATE_ON, "armed_home"),
(DOMAIN_BINARY_SENSOR, STATE_ON, STATE_ON),
(DOMAIN_COVER, STATE_ON, "open"),
(DOMAIN_FAN, STATE_ON, STATE_ON),
(DOMAIN_IMAGE, "test.jpg", "2025-06-13T00:00:00+00:00"),
(DOMAIN_LIGHT, STATE_ON, STATE_ON),
(DOMAIN_LOCK, STATE_ON, "locked"),
(DOMAIN_NUMBER, "1", "1.0"),
(DOMAIN_SELECT, "option1", "option1"),
(DOMAIN_SENSOR, "foo", "foo"),
(DOMAIN_SWITCH, STATE_ON, STATE_ON),
(DOMAIN_VACUUM, "cleaning", "cleaning"),
(DOMAIN_WEATHER, "sunny", "sunny"),
(ALARM_CONTROL_PANEL_DOMAIN, STATE_ON, "armed_home"),
(BINARY_SENSOR_DOMAIN, STATE_ON, STATE_ON),
(COVER_DOMAIN, STATE_ON, "open"),
(FAN_DOMAIN, STATE_ON, STATE_ON),
(IMAGE_DOMAIN, "test.jpg", "2025-06-13T00:00:00+00:00"),
(LIGHT_DOMAIN, STATE_ON, STATE_ON),
(LOCK_DOMAIN, STATE_ON, "locked"),
(NUMBER_DOMAIN, "1", "1.0"),
(SELECT_DOMAIN, "option1", "option1"),
(SENSOR_DOMAIN, "foo", "foo"),
(SWITCH_DOMAIN, STATE_ON, STATE_ON),
(VACUUM_DOMAIN, "cleaning", "cleaning"),
(WEATHER_DOMAIN, "sunny", "sunny"),
],
)
@pytest.mark.freeze_time("2025-06-13 00:00:00+00:00")