evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace EventType with Event [t-z] (#112742)

Browse source
This commit is contained in:
Marc Mueller 2024-03-08 19:37:26 +01:00 • committed by GitHub
parent 84c44c1835
commit 3db28d46b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
homeassistant/components/template/template_entity.py
View file

@ -21,6 +21,7 @@ from homeassistant.const import (
from homeassistant.core import (
CALLBACK_TYPE,
Context,
Event,
HomeAssistant,
State,
callback,
@ -47,7 +48,7 @@ from homeassistant.helpers.trigger_template_entity import (
TEMPLATE_ENTITY_BASE_SCHEMA,
make_template_entity_base_schema,
)
from homeassistant.helpers.typing import ConfigType, EventType
from homeassistant.helpers.typing import ConfigType
from .const import (
CONF_ATTRIBUTE_TEMPLATES,
@ -190,7 +191,7 @@ class _TemplateAttribute:
@callback
def handle_result(
self,
event: EventType[EventStateChangedData] | None,
event: Event[EventStateChangedData] | None,
template: Template,
last_result: str | None | TemplateError,
result: str | TemplateError,
@ -399,7 +400,7 @@ class TemplateEntity(Entity):
@callback
def _handle_results(
self,
event: EventType[EventStateChangedData] | None,
event: Event[EventStateChangedData] | None,
updates: list[TrackTemplateResult],
) -> None:
"""Call back the results to the attributes."""

6
homeassistant/components/template/trigger.py
View file

@ -8,7 +8,7 @@ import voluptuous as vol
from homeassistant import exceptions
from homeassistant.const import CONF_FOR, CONF_PLATFORM, CONF_VALUE_TEMPLATE
from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
from homeassistant.core import CALLBACK_TYPE, Event, HassJob, HomeAssistant, callback
from homeassistant.helpers import config_validation as cv, template
from homeassistant.helpers.event import (
EventStateChangedData,
@ -19,7 +19,7 @@ from homeassistant.helpers.event import (
)
from homeassistant.helpers.template import Template, result_as_boolean
from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
from homeassistant.helpers.typing import ConfigType, EventType
from homeassistant.helpers.typing import ConfigType
_LOGGER = logging.getLogger(__name__)
@ -65,7 +65,7 @@ async def async_attach_trigger(
@callback
def template_listener(
event: EventType[EventStateChangedData] | None,
event: Event[EventStateChangedData] | None,
updates: list[TrackTemplateResult],
) -> None:
"""Listen for state changes and calls action."""

6
homeassistant/components/threshold/binary_sensor.py
View file

@ -22,7 +22,7 @@ from homeassistant.const import (
STATE_UNAVAILABLE,
STATE_UNKNOWN,
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.core import Event, HomeAssistant, callback
from homeassistant.helpers import (
config_validation as cv,
device_registry as dr,
@ -34,7 +34,7 @@ from homeassistant.helpers.event import (
EventStateChangedData,
async_track_state_change_event,
)
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, EventType
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from .const import CONF_HYSTERESIS, CONF_LOWER, CONF_UPPER
@ -215,7 +215,7 @@ class ThresholdSensor(BinarySensorEntity):
@callback
def async_threshold_sensor_state_listener(
event: EventType[EventStateChangedData],
event: Event[EventStateChangedData],
) -> None:
"""Handle sensor state changes."""
_update_sensor_state()

6
homeassistant/components/trend/binary_sensor.py
View file

@ -31,7 +31,7 @@ from homeassistant.const import (
STATE_UNAVAILABLE,
STATE_UNKNOWN,
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.core import Event, HomeAssistant, callback
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import generate_entity_id
from homeassistant.helpers.entity_platform import AddEntitiesCallback
@ -41,7 +41,7 @@ from homeassistant.helpers.event import (
)
from homeassistant.helpers.reload import async_setup_reload_service
from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, EventType
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from homeassistant.util.dt import utcnow
from . import PLATFORMS
@ -215,7 +215,7 @@ class SensorTrend(BinarySensorEntity, RestoreEntity):
@callback
def trend_sensor_state_listener(
event: EventType[EventStateChangedData],
event: Event[EventStateChangedData],
) -> None:
"""Handle state changes on the observed device."""
if (new_state := event.data["new_state"]) is None:

8
homeassistant/components/universal/media_player.py
View file

@ -79,7 +79,7 @@ from homeassistant.const import (
STATE_UNAVAILABLE,
STATE_UNKNOWN,
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.core import Event, HomeAssistant, callback
from homeassistant.exceptions import TemplateError
from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.entity_component import EntityComponent
@ -93,7 +93,7 @@ from homeassistant.helpers.event import (
)
from homeassistant.helpers.reload import async_setup_reload_service
from homeassistant.helpers.service import async_call_from_config
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, EventType
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
ATTR_ACTIVE_CHILD = "active_child"
@ -186,7 +186,7 @@ class UniversalMediaPlayer(MediaPlayerEntity):
@callback
def _async_on_dependency_update(
event: EventType[EventStateChangedData],
event: Event[EventStateChangedData],
) -> None:
"""Update ha state when dependencies update."""
self.async_set_context(event.context)
@ -194,7 +194,7 @@ class UniversalMediaPlayer(MediaPlayerEntity):
@callback
def _async_on_template_update(
event: EventType[EventStateChangedData] | None,
event: Event[EventStateChangedData] | None,
updates: list[TrackTemplateResult],
) -> None:
"""Update state when template state changes."""

8
homeassistant/components/utility_meter/sensor.py
View file

@ -28,7 +28,7 @@ from homeassistant.const import (
STATE_UNKNOWN,
UnitOfEnergy,
)
from homeassistant.core import HomeAssistant, State, callback
from homeassistant.core import Event, HomeAssistant, State, callback
from homeassistant.helpers import (
device_registry as dr,
entity_platform,
@ -44,7 +44,7 @@ from homeassistant.helpers.event import (
)
from homeassistant.helpers.start import async_at_started
from homeassistant.helpers.template import is_number
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, EventType
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from homeassistant.util import slugify
import homeassistant.util.dt as dt_util
@ -466,7 +466,7 @@ class UtilityMeterSensor(RestoreSensor):
return None
@callback
def async_reading(self, event: EventType[EventStateChangedData]) -> None:
def async_reading(self, event: Event[EventStateChangedData]) -> None:
"""Handle the sensor state changes."""
if (
source_state := self.hass.states.get(self._sensor_source_id)
@ -517,7 +517,7 @@ class UtilityMeterSensor(RestoreSensor):
self.async_write_ha_state()
@callback
def async_tariff_change(self, event: EventType[EventStateChangedData]) -> None:
def async_tariff_change(self, event: Event[EventStateChangedData]) -> None:
"""Handle tariff changes."""
if (new_state := event.data["new_state"]) is None:
return

3
homeassistant/components/websocket_api/commands.py
View file

@ -48,7 +48,6 @@ from homeassistant.helpers.json import (
json_bytes,
)
from homeassistant.helpers.service import async_get_all_descriptions
from homeassistant.helpers.typing import EventType
from homeassistant.loader import (
Integration,
IntegrationNotFound,
@ -622,7 +621,7 @@ async def handle_render_template(
@callback
def _template_listener(
event: EventType[EventStateChangedData] | None,
event: Event[EventStateChangedData] | None,
updates: list[TrackTemplateResult],
) -> None:
track_template_result = updates.pop()

7
homeassistant/components/zha/entity.py
View file

@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, Any, Self
from zigpy.quirks.v2 import EntityMetadata, EntityType
from homeassistant.const import ATTR_NAME, EntityCategory
from homeassistant.core import CALLBACK_TYPE, callback
from homeassistant.core import CALLBACK_TYPE, Event, callback
from homeassistant.helpers import entity
from homeassistant.helpers.debounce import Debouncer
from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE, DeviceInfo
@ -24,7 +24,6 @@ from homeassistant.helpers.event import (
async_track_state_change_event,
)
from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.helpers.typing import EventType
from .core.const import (
ATTR_MANUFACTURER,
@ -346,9 +345,7 @@ class ZhaGroupEntity(BaseZhaEntity):
self.async_on_remove(send_removed_signal)
@callback
def async_state_changed_listener(
self, event: EventType[EventStateChangedData]
) -> None:
def async_state_changed_listener(self, event: Event[EventStateChangedData]) -> None:
"""Handle child updates."""
# Delay to ensure that we get updates from all members before updating the group
assert self._change_listener_debouncer

8
homeassistant/components/zone/__init__.py
View file

@ -38,7 +38,7 @@ from homeassistant.helpers import (
service,
storage,
)
from homeassistant.helpers.typing import ConfigType, EventType
from homeassistant.helpers.typing import ConfigType
from homeassistant.loader import bind_hass
from homeassistant.util.location import distance
@ -166,7 +166,7 @@ def async_setup_track_zone_entity_ids(hass: HomeAssistant) -> None:
@callback
def _async_add_zone_entity_id(
event_: EventType[event.EventStateChangedData],
event_: Event[event.EventStateChangedData],
) -> None:
"""Add zone entity ID."""
zone_entity_ids.append(event_.data["entity_id"])
@ -174,7 +174,7 @@ def async_setup_track_zone_entity_ids(hass: HomeAssistant) -> None:
@callback
def _async_remove_zone_entity_id(
event_: EventType[event.EventStateChangedData],
event_: Event[event.EventStateChangedData],
) -> None:
"""Remove zone entity ID."""
zone_entity_ids.remove(event_.data["entity_id"])
@ -389,7 +389,7 @@ class Zone(collection.CollectionEntity):
@callback
def _person_state_change_listener(
self, evt: EventType[event.EventStateChangedData]
self, evt: Event[event.EventStateChangedData]
) -> None:
person_entity_id = evt.data["entity_id"]
cur_count = len(self._persons_in_zone)

6
homeassistant/components/zone/trigger.py
View file

@ -13,7 +13,7 @@ from homeassistant.const import (
CONF_PLATFORM,
CONF_ZONE,
)
from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
from homeassistant.core import CALLBACK_TYPE, Event, HassJob, HomeAssistant, callback
from homeassistant.helpers import (
condition,
config_validation as cv,
@ -25,7 +25,7 @@ from homeassistant.helpers.event import (
async_track_state_change_event,
)
from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
from homeassistant.helpers.typing import ConfigType, EventType
from homeassistant.helpers.typing import ConfigType
EVENT_ENTER = "enter"
EVENT_LEAVE = "leave"
@ -75,7 +75,7 @@ async def async_attach_trigger(
job = HassJob(action)
@callback
def zone_automation_listener(zone_event: EventType[EventStateChangedData]) -> None:
def zone_automation_listener(zone_event: Event[EventStateChangedData]) -> None:
"""Listen for state changes and calls action."""
entity = zone_event.data["entity_id"]
from_s = zone_event.data["old_state"]