From 01581ff92e9c23e40182ac46f4d33360f8aada6f Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 20 Apr 2020 13:31:50 -0500 Subject: [PATCH] Switch myq to async_on_remove (#34473) --- homeassistant/components/myq/binary_sensor.py | 13 +++---------- homeassistant/components/myq/cover.py | 5 +++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/homeassistant/components/myq/binary_sensor.py b/homeassistant/components/myq/binary_sensor.py index 7ce303e5d19..a54b8e50ece 100644 --- a/homeassistant/components/myq/binary_sensor.py +++ b/homeassistant/components/myq/binary_sensor.py @@ -5,7 +5,6 @@ from homeassistant.components.binary_sensor import ( DEVICE_CLASS_CONNECTIVITY, BinarySensorDevice, ) -from homeassistant.core import callback from .const import ( DOMAIN, @@ -95,14 +94,8 @@ class MyQBinarySensorDevice(BinarySensorDevice): """Return False, updates are controlled via coordinator.""" return False - @callback - def _async_consume_update(self): - self.async_write_ha_state() - async def async_added_to_hass(self): """Subscribe to updates.""" - self._coordinator.async_add_listener(self._async_consume_update) - - async def async_will_remove_from_hass(self): - """Undo subscription.""" - self._coordinator.async_remove_listener(self._async_consume_update) + self.async_on_remove( + self._coordinator.async_add_listener(self.async_write_ha_state) + ) diff --git a/homeassistant/components/myq/cover.py b/homeassistant/components/myq/cover.py index 57308a778a5..04eb49c00a9 100644 --- a/homeassistant/components/myq/cover.py +++ b/homeassistant/components/myq/cover.py @@ -209,10 +209,11 @@ class MyQDevice(CoverDevice): async def async_added_to_hass(self): """Subscribe to updates.""" - self._coordinator.async_add_listener(self._async_consume_update) + self.async_on_remove( + self._coordinator.async_add_listener(self._async_consume_update) + ) async def async_will_remove_from_hass(self): """Undo subscription.""" - self._coordinator.async_remove_listener(self._async_consume_update) if self._scheduled_transition_update: self._scheduled_transition_update()