Skip to content

Commit 4d76ed9

Browse files
authored
Fix implicit reexport [helpers.condition] (home-assistant#63830)
1 parent 1dd8781 commit 4d76ed9

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

homeassistant/components/binary_sensor/device_condition.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
import voluptuous as vol
55

66
from homeassistant.components.device_automation.const import CONF_IS_OFF, CONF_IS_ON
7-
from homeassistant.const import CONF_ENTITY_ID, CONF_FOR, CONF_TYPE
7+
from homeassistant.const import (
8+
CONF_CONDITION,
9+
CONF_ENTITY_ID,
10+
CONF_FOR,
11+
CONF_STATE,
12+
CONF_TYPE,
13+
)
814
from homeassistant.core import HomeAssistant, callback
915
from homeassistant.helpers import condition, config_validation as cv
1016
from homeassistant.helpers.entity import get_device_class
@@ -301,9 +307,9 @@ def async_condition_from_config(
301307
else:
302308
stat = "off"
303309
state_config = {
304-
condition.CONF_CONDITION: "state",
305-
condition.CONF_ENTITY_ID: config[CONF_ENTITY_ID],
306-
condition.CONF_STATE: stat,
310+
CONF_CONDITION: "state",
311+
CONF_ENTITY_ID: config[CONF_ENTITY_ID],
312+
CONF_STATE: stat,
307313
}
308314
if CONF_FOR in config:
309315
state_config[CONF_FOR] = config[CONF_FOR]

homeassistant/components/device_automation/toggle_entity.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
CONF_ENTITY_ID,
1717
CONF_FOR,
1818
CONF_PLATFORM,
19+
CONF_STATE,
1920
CONF_TYPE,
2021
)
2122
from homeassistant.core import CALLBACK_TYPE, Context, HomeAssistant, callback
@@ -138,9 +139,9 @@ def async_condition_from_config(
138139
else:
139140
stat = "off"
140141
state_config = {
141-
condition.CONF_CONDITION: "state",
142-
condition.CONF_ENTITY_ID: config[CONF_ENTITY_ID],
143-
condition.CONF_STATE: stat,
142+
CONF_CONDITION: "state",
143+
CONF_ENTITY_ID: config[CONF_ENTITY_ID],
144+
CONF_STATE: stat,
144145
}
145146
if CONF_FOR in config:
146147
state_config[CONF_FOR] = config[CONF_FOR]

homeassistant/components/sensor/device_condition.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66
from homeassistant.components.device_automation.exceptions import (
77
InvalidDeviceAutomationConfig,
88
)
9-
from homeassistant.const import CONF_ABOVE, CONF_BELOW, CONF_ENTITY_ID, CONF_TYPE
9+
from homeassistant.const import (
10+
CONF_ABOVE,
11+
CONF_BELOW,
12+
CONF_CONDITION,
13+
CONF_ENTITY_ID,
14+
CONF_TYPE,
15+
)
1016
from homeassistant.core import HomeAssistant, callback
1117
from homeassistant.exceptions import HomeAssistantError
1218
from homeassistant.helpers import condition, config_validation as cv
@@ -169,13 +175,13 @@ def async_condition_from_config(
169175
) -> condition.ConditionCheckerType:
170176
"""Evaluate state based on configuration."""
171177
numeric_state_config = {
172-
condition.CONF_CONDITION: "numeric_state",
173-
condition.CONF_ENTITY_ID: config[CONF_ENTITY_ID],
178+
CONF_CONDITION: "numeric_state",
179+
CONF_ENTITY_ID: config[CONF_ENTITY_ID],
174180
}
175181
if CONF_ABOVE in config:
176-
numeric_state_config[condition.CONF_ABOVE] = config[CONF_ABOVE]
182+
numeric_state_config[CONF_ABOVE] = config[CONF_ABOVE]
177183
if CONF_BELOW in config:
178-
numeric_state_config[condition.CONF_BELOW] = config[CONF_BELOW]
184+
numeric_state_config[CONF_BELOW] = config[CONF_BELOW]
179185

180186
numeric_state_config = cv.NUMERIC_STATE_CONDITION_SCHEMA(numeric_state_config)
181187
numeric_state_config = condition.numeric_state_validate_config(

0 commit comments

Comments
 (0)