From ed23bb7c042a18005eb48b0e6b1159c3d437be60 Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Tue, 5 Mar 2024 21:36:11 +0100 Subject: [PATCH] Small cleanup in Dexcom (#112425) --- homeassistant/components/dexcom/__init__.py | 23 +++++---------------- homeassistant/components/dexcom/const.py | 3 --- homeassistant/components/dexcom/sensor.py | 5 ++--- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/homeassistant/components/dexcom/__init__.py b/homeassistant/components/dexcom/__init__.py index 2d7c2120758..3ef6f7fd72e 100644 --- a/homeassistant/components/dexcom/__init__.py +++ b/homeassistant/components/dexcom/__init__.py @@ -10,15 +10,7 @@ from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed -from .const import ( - CONF_SERVER, - COORDINATOR, - DOMAIN, - MG_DL, - PLATFORMS, - SERVER_OUS, - UNDO_UPDATE_LISTENER, -) +from .const import CONF_SERVER, DOMAIN, MG_DL, PLATFORMS, SERVER_OUS _LOGGER = logging.getLogger(__name__) @@ -59,11 +51,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: ) await coordinator.async_config_entry_first_refresh() - hass.data.setdefault(DOMAIN, {}) - hass.data[DOMAIN][entry.entry_id] = { - COORDINATOR: coordinator, - UNDO_UPDATE_LISTENER: entry.add_update_listener(update_listener), - } + hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator + + entry.async_on_unload(entry.add_update_listener(update_listener)) await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) @@ -72,10 +62,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: """Unload a config entry.""" - unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS) - hass.data[DOMAIN][entry.entry_id][UNDO_UPDATE_LISTENER]() - - if unload_ok: + if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS): hass.data[DOMAIN].pop(entry.entry_id) return unload_ok diff --git a/homeassistant/components/dexcom/const.py b/homeassistant/components/dexcom/const.py index 8712eeb10ad..1a0eeeba090 100644 --- a/homeassistant/components/dexcom/const.py +++ b/homeassistant/components/dexcom/const.py @@ -24,6 +24,3 @@ CONF_SERVER = "server" SERVER_OUS = "EU" SERVER_US = "US" - -COORDINATOR = "coordinator" -UNDO_UPDATE_LISTENER = "undo_update_listener" diff --git a/homeassistant/components/dexcom/sensor.py b/homeassistant/components/dexcom/sensor.py index 592419abc1b..9a7a8631092 100644 --- a/homeassistant/components/dexcom/sensor.py +++ b/homeassistant/components/dexcom/sensor.py @@ -12,7 +12,7 @@ from homeassistant.helpers.update_coordinator import ( DataUpdateCoordinator, ) -from .const import COORDINATOR, DOMAIN, GLUCOSE_TREND_ICON, MG_DL +from .const import DOMAIN, GLUCOSE_TREND_ICON, MG_DL async def async_setup_entry( @@ -21,7 +21,7 @@ async def async_setup_entry( async_add_entities: AddEntitiesCallback, ) -> None: """Set up the Dexcom sensors.""" - coordinator = hass.data[DOMAIN][config_entry.entry_id][COORDINATOR] + coordinator = hass.data[DOMAIN][config_entry.entry_id] username = config_entry.data[CONF_USERNAME] unit_of_measurement = config_entry.options[CONF_UNIT_OF_MEASUREMENT] async_add_entities( @@ -31,7 +31,6 @@ async def async_setup_entry( coordinator, username, config_entry.entry_id, unit_of_measurement ), ], - False, )