From e56a676fd5b56165ce144434125e39ffe38a7b69 Mon Sep 17 00:00:00 2001 From: jjlawren Date: Thu, 2 Dec 2021 11:21:49 -0600 Subject: [PATCH] Import helpers in Sonos instead of accessing `hass` (#60848) --- homeassistant/components/sonos/__init__.py | 8 +++++--- homeassistant/components/sonos/speaker.py | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/sonos/__init__.py b/homeassistant/components/sonos/__init__.py index c8defb1ff14..8320d7f681a 100644 --- a/homeassistant/components/sonos/__init__.py +++ b/homeassistant/components/sonos/__init__.py @@ -24,6 +24,7 @@ from homeassistant.const import CONF_HOSTS, EVENT_HOMEASSISTANT_STOP from homeassistant.core import Event, HomeAssistant, callback from homeassistant.helpers import config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_send +from homeassistant.helpers.event import async_track_time_interval, call_later from .alarms import SonosAlarms from .const import ( @@ -236,8 +237,8 @@ class SonosDiscoveryManager: if soco and soco.is_visible: self._discovered_player(soco) - self.data.hosts_heartbeat = self.hass.helpers.event.call_later( - DISCOVERY_INTERVAL.total_seconds(), self._manual_hosts + self.data.hosts_heartbeat = call_later( + self.hass, DISCOVERY_INTERVAL.total_seconds(), self._manual_hosts ) def _discovered_ip(self, ip_address): @@ -331,7 +332,8 @@ class SonosDiscoveryManager: ) self.entry.async_on_unload( - self.hass.helpers.event.async_track_time_interval( + async_track_time_interval( + self.hass, partial( async_dispatcher_send, self.hass, diff --git a/homeassistant/components/sonos/speaker.py b/homeassistant/components/sonos/speaker.py index f45a81060f8..a6a1ffc1fe4 100644 --- a/homeassistant/components/sonos/speaker.py +++ b/homeassistant/components/sonos/speaker.py @@ -33,6 +33,7 @@ from homeassistant.helpers.dispatcher import ( async_dispatcher_send, dispatcher_send, ) +from homeassistant.helpers.event import async_track_time_interval, track_time_interval from homeassistant.util import dt as dt_util from .alarms import SonosAlarms @@ -240,8 +241,8 @@ class SonosSpeaker: if battery_info := fetch_battery_info_or_none(self.soco): self.battery_info = battery_info # Battery events can be infrequent, polling is still necessary - self._battery_poll_timer = self.hass.helpers.event.track_time_interval( - self.async_poll_battery, BATTERY_SCAN_INTERVAL + self._battery_poll_timer = track_time_interval( + self.hass, self.async_poll_battery, BATTERY_SCAN_INTERVAL ) dispatcher_send(self.hass, SONOS_CREATE_BATTERY, self) else: @@ -337,7 +338,8 @@ class SonosSpeaker: # Create a polling task in case subscriptions fail or callback events do not arrive if not self._poll_timer: - self._poll_timer = self.hass.helpers.event.async_track_time_interval( + self._poll_timer = async_track_time_interval( + self.hass, partial( async_dispatcher_send, self.hass,