Assign hass in Condition init (#158062)

homeassistant/components/device_automation/condition.py

@@ -56,7 +56,6 @@ class DeviceAutomationConditionProtocol(Protocol):
 class DeviceCondition(Condition):
     """Device condition."""
 
-    _hass: HomeAssistant
     _config: ConfigType
 
     @classmethod
@@ -87,7 +86,7 @@ class DeviceCondition(Condition):
 
     def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
         """Initialize condition."""
-        self._hass = hass
+        super().__init__(hass, config)
         assert config.options is not None
         self._config = config.options
 

homeassistant/components/light/condition.py

@@ -52,7 +52,7 @@ class StateConditionBase(Condition):
         self, hass: HomeAssistant, config: ConditionConfig, state: str
     ) -> None:
         """Initialize condition."""
-        self._hass = hass
+        super().__init__(hass, config)
         if TYPE_CHECKING:
             assert config.target
             assert config.options

homeassistant/components/sun/condition.py

@@ -150,6 +150,7 @@ class SunCondition(Condition):
 
     def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
         """Initialize condition."""
+        super().__init__(hass, config)
         assert config.options is not None
         self._options = config.options
 

homeassistant/components/zone/condition.py

@@ -114,6 +114,7 @@ class ZoneCondition(Condition):
 
     def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
         """Initialize condition."""
+        super().__init__(hass, config)
         assert config.options is not None
         self._options = config.options
 

homeassistant/helpers/condition.py

@@ -259,6 +259,8 @@ _CONDITION_SCHEMA = _CONDITION_BASE_SCHEMA.extend(
 class Condition(abc.ABC):
     """Condition class."""
 
+    _hass: HomeAssistant
+
     @classmethod
     async def async_validate_complete_config(
         cls, hass: HomeAssistant, complete_config: ConfigType
@@ -293,6 +295,7 @@ class Condition(abc.ABC):
 
     def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
         """Initialize condition."""
+        self._hass = hass
 
     @abc.abstractmethod
     async def async_get_checker(self) -> ConditionCheckerType:

tests/helpers/test_condition.py

@@ -37,7 +37,6 @@ from homeassistant.helpers.automation import move_top_level_schema_fields_to_opt
 from homeassistant.helpers.condition import (
     Condition,
     ConditionCheckerType,
-    ConditionConfig,
     async_validate_condition_config,
 )
 from homeassistant.helpers.template import Template
@@ -2124,9 +2123,6 @@ async def test_platform_multiple_conditions(hass: HomeAssistant) -> None:
             """Validate config."""
             return config
 
-        def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
-            """Initialize condition."""
-
     class MockCondition1(MockCondition):
         """Mock condition 1."""