From fbb406842eb3e028604b2479034e425a5ab1d0b0 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Sat, 31 Dec 2022 03:17:37 -0700 Subject: [PATCH] Remove redundant Guardian handler unsub logic (#84905) --- homeassistant/components/guardian/__init__.py | 7 ++++--- homeassistant/components/guardian/util.py | 11 +---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/guardian/__init__.py b/homeassistant/components/guardian/__init__.py index 24999f98e16..f587ef2e54c 100644 --- a/homeassistant/components/guardian/__init__.py +++ b/homeassistant/components/guardian/__init__.py @@ -322,10 +322,11 @@ class PairedSensorManager: """Define a callback for when new paired sensor data is received.""" self._hass.async_create_task(self.async_process_latest_paired_sensor_uids()) - cancel_process_task = self._sensor_pair_dump_coordinator.async_add_listener( - async_create_process_task + self._entry.async_on_unload( + self._sensor_pair_dump_coordinator.async_add_listener( + async_create_process_task + ) ) - self._entry.async_on_unload(cancel_process_task) async def async_pair_sensor(self, uid: str) -> None: """Add a new paired sensor coordinator.""" diff --git a/homeassistant/components/guardian/util.py b/homeassistant/components/guardian/util.py index 250fee58db5..010f65cd114 100644 --- a/homeassistant/components/guardian/util.py +++ b/homeassistant/components/guardian/util.py @@ -87,7 +87,6 @@ class GuardianDataUpdateCoordinator(DataUpdateCoordinator[dict]): self._api_coro = api_coro self._api_lock = api_lock self._client = client - self._signal_handler_unsubs: list[Callable[..., None]] = [] self.config_entry = entry self.signal_reboot_requested = SIGNAL_REBOOT_REQUESTED.format( @@ -112,16 +111,8 @@ class GuardianDataUpdateCoordinator(DataUpdateCoordinator[dict]): self.last_update_success = False self.async_update_listeners() - self._signal_handler_unsubs.append( + self.config_entry.async_on_unload( async_dispatcher_connect( self.hass, self.signal_reboot_requested, async_reboot_requested ) ) - - @callback - def async_teardown() -> None: - """Tear the coordinator down appropriately.""" - for unsub in self._signal_handler_unsubs: - unsub() - - self.config_entry.async_on_unload(async_teardown)