jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-28 07:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup deprecated async_get_registry in gios (#72065)

Browse Source
This commit is contained in:
epenet 2022-05-18 13:18:43 +02:00 committed by GitHub
parent 19fdc3e630
commit eae8a59b7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/gios/__init__.py
View File

@ -13,9 +13,8 @@ from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import Platform from homeassistant.const import Platform
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry from homeassistant.helpers import device_registry as dr, entity_registry as er
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.device_registry import async_get_registry
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
from .const import API_TIMEOUT, CONF_STATION_ID, DOMAIN, SCAN_INTERVAL from .const import API_TIMEOUT, CONF_STATION_ID, DOMAIN, SCAN_INTERVAL
@ -35,7 +34,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
hass.config_entries.async_update_entry(entry, unique_id=str(station_id)) # type: ignore[unreachable] hass.config_entries.async_update_entry(entry, unique_id=str(station_id)) # type: ignore[unreachable]
# We used to use int in device_entry identifiers, convert this to str. # We used to use int in device_entry identifiers, convert this to str.
device_registry = await async_get_registry(hass) device_registry = dr.async_get(hass)
old_ids = (DOMAIN, station_id) old_ids = (DOMAIN, station_id)
device_entry = device_registry.async_get_device({old_ids}) # type: ignore[arg-type] device_entry = device_registry.async_get_device({old_ids}) # type: ignore[arg-type]
if device_entry and entry.entry_id in device_entry.config_entries: if device_entry and entry.entry_id in device_entry.config_entries:
@ -53,7 +52,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
hass.config_entries.async_setup_platforms(entry, PLATFORMS) hass.config_entries.async_setup_platforms(entry, PLATFORMS)
# Remove air_quality entities from registry if they exist # Remove air_quality entities from registry if they exist
ent_reg = entity_registry.async_get(hass) ent_reg = er.async_get(hass)
unique_id = str(coordinator.gios.station_id) unique_id = str(coordinator.gios.station_id)
if entity_id := ent_reg.async_get_entity_id( if entity_id := ent_reg.async_get_entity_id(
AIR_QUALITY_PLATFORM, DOMAIN, unique_id AIR_QUALITY_PLATFORM, DOMAIN, unique_id

4
homeassistant/components/gios/sensor.py
View File

@ -8,10 +8,10 @@ from homeassistant.components.sensor import DOMAIN as PLATFORM, SensorEntity
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ATTR_ATTRIBUTION, ATTR_NAME, CONF_NAME from homeassistant.const import ATTR_ATTRIBUTION, ATTR_NAME, CONF_NAME
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.device_registry import DeviceEntryType
from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity import DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.entity_registry import async_get_registry
from homeassistant.helpers.typing import StateType from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity from homeassistant.helpers.update_coordinator import CoordinatorEntity
@ -43,7 +43,7 @@ async def async_setup_entry(
# Due to the change of the attribute name of one sensor, it is necessary to migrate # Due to the change of the attribute name of one sensor, it is necessary to migrate
# the unique_id to the new name. # the unique_id to the new name.
entity_registry = await async_get_registry(hass) entity_registry = er.async_get(hass)
old_unique_id = f"{coordinator.gios.station_id}-pm2.5" old_unique_id = f"{coordinator.gios.station_id}-pm2.5"
if entity_id := entity_registry.async_get_entity_id( if entity_id := entity_registry.async_get_entity_id(
PLATFORM, DOMAIN, old_unique_id PLATFORM, DOMAIN, old_unique_id