Fix some deprecated methods in Home Assistant 2025.1

Author: turbulator

custom_components/pandora_cas/__init__.py

@@ -12,9 +12,10 @@
 from homeassistant import config_entries
 from homeassistant.config_entries import SOURCE_DISCOVERY, ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers import discovery
 from homeassistant.helpers.event import async_track_time_interval, track_time_interval
-from homeassistant.helpers.typing import ConfigType, HomeAssistantType
+from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .api import PandoraApi, PandoraApiException
@@ -64,7 +65,7 @@
 PANDORA_CAS_PLATFORMS = ["sensor", "binary_sensor", "device_tracker"]
 
 
-async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Activate Pandora Car Alarm System component"""
 
     hass.data[DOMAIN] = {}
@@ -91,7 +92,7 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Setup configuration entry for Pandora Car Alarm System."""
 
     username = config_entry.data[CONF_USERNAME]
@@ -122,18 +123,13 @@ async def _execute_command(call) -> bool:
         _LOGGER.error("Setting up entry %s failed: %s", username, str(ex))
         return False
 
-    for platform in PANDORA_CAS_PLATFORMS:
-        hass.async_create_task(hass.config_entries.async_forward_entry_setup(config_entry, platform))
+    await hass.config_entries.async_forward_entry_setups(config_entry, PANDORA_CAS_PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistantType, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Unload the config entry and platforms."""
     hass.data.pop(DOMAIN)
 
-    tasks = []
-    for platform in PANDORA_CAS_PLATFORMS:
-        tasks.append(hass.config_entries.async_forward_entry_unload(config_entry, platform))
-
-    return all(await asyncio.gather(*tasks))
+    return await hass.config_entries.async_unload_platforms(entry, PANDORA_CAS_PLATFORMS)

custom_components/pandora_cas/api.py

@@ -7,10 +7,9 @@
 from typing import Callable
 
 import aiohttp
-from homeassistant.core import CALLBACK_TYPE, callback
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.helpers.event import async_track_point_in_utc_time
-from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util.dt import utcnow
 
@@ -49,7 +48,7 @@ class PandoraApiException(Exception):
 class PandoraApi:
     """Pandora API class."""
 
-    def __init__(self, hass: HomeAssistantType, username: str, password: str, polling_interval: int) -> None:
+    def __init__(self, hass: HomeAssistant, username: str, password: str, polling_interval: int) -> None:
         """Constructor"""
         self._hass = hass
         self._username = username

custom_components/pandora_cas/binary_sensor.py

@@ -12,8 +12,7 @@
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_DEVICE_CLASS, ATTR_ICON, ATTR_NAME
-from homeassistant.core import callback
-from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import slugify
 
 from .api import PandoraDevice
@@ -134,7 +133,7 @@
 
 
 # pylint: disable=unused-argument
-async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry, async_add_entities):
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_entities):
     """"""
 
     api = hass.data[DOMAIN]

custom_components/pandora_cas/device_tracker.py

@@ -8,9 +8,9 @@
 from homeassistant.components.device_tracker import DOMAIN as PLATFORM_DOMAIN, SourceType
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import slugify
-from homeassistant.core import callback
+
 
 from .api import PandoraDevice
 from .const import DOMAIN
@@ -19,7 +19,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 # pylint: disable=unused-argument
-async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigEntry, async_add_entities):
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, async_add_entities):
     """Set up the tracker."""
 
     api = hass.data[DOMAIN]
@@ -42,7 +42,7 @@ async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigEntry,
 class PandoraTrackerEntity(TrackerEntity):
     """"""
 
-    def __init__(self, hass: HomeAssistantType, device: PandoraDevice):
+    def __init__(self, hass: HomeAssistant, device: PandoraDevice):
         self._hass = hass
         self._device = device
         self._latitude = None

custom_components/pandora_cas/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/turbulator/pandora-cas/issues",
   "requirements": [],
-  "version": "1.4.7"
+  "version": "1.4.8"
 }

custom_components/pandora_cas/sensor.py

@@ -9,8 +9,7 @@
 from homeassistant.components.sensor.const import SensorDeviceClass
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_DEVICE_CLASS, ATTR_ICON, ATTR_NAME, PERCENTAGE, UnitOfLength, UnitOfElectricPotential, UnitOfTemperature, UnitOfSpeed
-from homeassistant.core import callback
-from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import slugify
 
 from .api import PandoraDevice
@@ -100,7 +99,7 @@
 
 
 # pylint: disable=unused-argument
-async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry, async_add_entities):
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_entities):
     """Set up ecobee binary (occupancy) sensors."""
 
     api = hass.data[DOMAIN]