From 1c7bf9f589006478d66691c944820315b7820ffb Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sat, 8 Feb 2025 13:22:37 +0100 Subject: [PATCH] Explicitly pass in the config_entry in enigma2 coordinator (#137739) explicitly pass in the config_entry in coordinator --- homeassistant/components/enigma2/__init__.py | 7 ++----- homeassistant/components/enigma2/coordinator.py | 11 +++++++++-- homeassistant/components/enigma2/media_player.py | 3 +-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/enigma2/__init__.py b/homeassistant/components/enigma2/__init__.py index da78f3dac5c..16295c7f228 100644 --- a/homeassistant/components/enigma2/__init__.py +++ b/homeassistant/components/enigma2/__init__.py @@ -1,12 +1,9 @@ """Support for Enigma2 devices.""" -from homeassistant.config_entries import ConfigEntry from homeassistant.const import Platform from homeassistant.core import HomeAssistant -from .coordinator import Enigma2UpdateCoordinator - -type Enigma2ConfigEntry = ConfigEntry[Enigma2UpdateCoordinator] +from .coordinator import Enigma2ConfigEntry, Enigma2UpdateCoordinator PLATFORMS = [Platform.MEDIA_PLAYER] @@ -22,6 +19,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: Enigma2ConfigEntry) -> b return True -async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: +async def async_unload_entry(hass: HomeAssistant, entry: Enigma2ConfigEntry) -> bool: """Unload a config entry.""" return await hass.config_entries.async_unload_platforms(entry, PLATFORMS) diff --git a/homeassistant/components/enigma2/coordinator.py b/homeassistant/components/enigma2/coordinator.py index d5bbf2c0ce5..9710d7f547f 100644 --- a/homeassistant/components/enigma2/coordinator.py +++ b/homeassistant/components/enigma2/coordinator.py @@ -30,18 +30,25 @@ from .const import CONF_SOURCE_BOUQUET, DOMAIN LOGGER = logging.getLogger(__package__) +type Enigma2ConfigEntry = ConfigEntry[Enigma2UpdateCoordinator] + class Enigma2UpdateCoordinator(DataUpdateCoordinator[OpenWebIfStatus]): """The Enigma2 data update coordinator.""" + config_entry: Enigma2ConfigEntry device: OpenWebIfDevice unique_id: str | None - def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None: + def __init__(self, hass: HomeAssistant, config_entry: Enigma2ConfigEntry) -> None: """Initialize the Enigma2 data update coordinator.""" super().__init__( - hass, logger=LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL + hass, + logger=LOGGER, + config_entry=config_entry, + name=DOMAIN, + update_interval=DEFAULT_SCAN_INTERVAL, ) base_url = URL.build( diff --git a/homeassistant/components/enigma2/media_player.py b/homeassistant/components/enigma2/media_player.py index 1012997ff7f..9a2a4564d1c 100644 --- a/homeassistant/components/enigma2/media_player.py +++ b/homeassistant/components/enigma2/media_player.py @@ -18,8 +18,7 @@ from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity -from . import Enigma2ConfigEntry -from .coordinator import Enigma2UpdateCoordinator +from .coordinator import Enigma2ConfigEntry, Enigma2UpdateCoordinator ATTR_MEDIA_CURRENTLY_RECORDING = "media_currently_recording" ATTR_MEDIA_DESCRIPTION = "media_description"