Skip to content

Clean up left-behind dispatcher handlers when removing RainMachine #18488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHjelmare merged 2 commits into from
Nov 17, 2018
Merged

Clean up left-behind dispatcher handlers when removing RainMachine #18488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efb402b
Clean up left-behind dispatcher handlers when removing RainMachine
bachya Nov 15, 2018
fd60f24
Member comments
bachya Nov 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions homeassistant/components/binary_sensor/rainmachine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,8 @@ def update(self):
"""Update the state."""
self.async_schedule_update_ha_state(True)

self._async_unsub_dispatcher_connect = async_dispatcher_connect(
self.hass, SENSOR_UPDATE_TOPIC, update)

async def async_will_remove_from_hass(self):
"""Disconnect dispatcher listener when removed."""
if self._async_unsub_dispatcher_connect:
self._async_unsub_dispatcher_connect()
self._dispatcher_handlers.append(async_dispatcher_connect(
self.hass, SENSOR_UPDATE_TOPIC, update))

async def async_update(self):
"""Update the state."""
Expand Down
8 changes: 7 additions & 1 deletion homeassistant/components/rainmachine/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class RainMachineEntity(Entity):
def __init__(self, rainmachine):
"""Initialize."""
self._attrs = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION}
self._async_unsub_dispatcher_connect = None
self._dispatcher_handlers = []
self._name = None
self.rainmachine = rainmachine

Expand All @@ -280,3 +280,9 @@ def device_state_attributes(self) -> dict:
def name(self) -> str:
"""Return the name of the entity."""
return self._name

async def async_will_remove_from_hass(self):
"""Disconnect dispatcher listener when removed."""
if self._dispatcher_handlers:
Comment thread
bachya marked this conversation as resolved.
Outdated
for handler in self._dispatcher_handlers:
handler()
9 changes: 2 additions & 7 deletions homeassistant/components/sensor/rainmachine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,8 @@ def update(self):
"""Update the state."""
self.async_schedule_update_ha_state(True)

self._async_unsub_dispatcher_connect = async_dispatcher_connect(
self.hass, SENSOR_UPDATE_TOPIC, update)

async def async_will_remove_from_hass(self):
"""Disconnect dispatcher listener when removed."""
if self._async_unsub_dispatcher_connect:
self._async_unsub_dispatcher_connect()
self._dispatcher_handlers.append(async_dispatcher_connect(
self.hass, SENSOR_UPDATE_TOPIC, update))

async def async_update(self):
"""Update the sensor's state."""
Expand Down
17 changes: 6 additions & 11 deletions homeassistant/components/switch/rainmachine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,8 @@ def zones(self) -> list:

async def async_added_to_hass(self):
"""Register callbacks."""
self._async_unsub_dispatcher_connect = async_dispatcher_connect(
self.hass, PROGRAM_UPDATE_TOPIC, self._program_updated)

async def async_will_remove_from_hass(self):
"""Disconnect dispatcher listener when removed."""
if self._async_unsub_dispatcher_connect:
self._async_unsub_dispatcher_connect()
self._dispatcher_handlers.append(async_dispatcher_connect(
self.hass, PROGRAM_UPDATE_TOPIC, self._program_updated))

async def async_turn_off(self, **kwargs) -> None:
"""Turn the program off."""
Expand Down Expand Up @@ -256,10 +251,10 @@ def is_on(self) -> bool:

async def async_added_to_hass(self):
"""Register callbacks."""
async_dispatcher_connect(
self.hass, PROGRAM_UPDATE_TOPIC, self._program_updated)
async_dispatcher_connect(
self.hass, ZONE_UPDATE_TOPIC, self._program_updated)
self._dispatcher_handlers.append(async_dispatcher_connect(
self.hass, PROGRAM_UPDATE_TOPIC, self._program_updated))
self._dispatcher_handlers.append(async_dispatcher_connect(
self.hass, ZONE_UPDATE_TOPIC, self._program_updated))

async def async_turn_off(self, **kwargs) -> None:
"""Turn the zone off."""
Expand Down