From 5ccf2aee0772e0a730b69c354c9ba01e25a97230 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Mon, 3 Feb 2020 18:01:55 -0700 Subject: [PATCH] Don't inline methods --- .../components/simplisafe/__init__.py | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py index 7047c09bdaa..5be545d5745 100644 --- a/homeassistant/components/simplisafe/__init__.py +++ b/homeassistant/components/simplisafe/__init__.py @@ -372,40 +372,39 @@ class SimpliSafeWebsocket: await self.async_websocket_disconnect() await self._async_attempt_websocket_connect() + def _on_connect(self): + """Define a handler to fire when the websocket is connected.""" + _LOGGER.info("Connected to websocket") + _LOGGER.debug("Websocket watchdog starting") + if self._websocket_watchdog_listener is not None: + self._websocket_watchdog_listener() + self._websocket_watchdog_listener = async_call_later( + self._hass, DEFAULT_WATCHDOG_SECONDS, self._async_websocket_reconnect + ) + + def _on_disconnect(self): + """Define a handler to fire when the websocket is disconnected.""" + _LOGGER.info("Disconnected from websocket") + + def _on_event(self, data): + """Define a handler to fire when a new SimpliSafe event arrives.""" + event = SimpliSafeWebsocketEvent(data) + _LOGGER.debug("New websocket event: %s", event) + self.last_events[data["sid"]] = event + async_dispatcher_send(self._hass, TOPIC_UPDATE.format(data["sid"])) + + _LOGGER.debug("Resetting websocket watchdog") + self._websocket_watchdog_listener() + self._websocket_watchdog_listener = async_call_later( + self._hass, DEFAULT_WATCHDOG_SECONDS, self._async_websocket_reconnect + ) + self._websocket_reconnect_delay = DEFAULT_SOCKET_MIN_RETRY + async def async_websocket_connect(self): """Register handlers and connect to the websocket.""" - - def on_connect(): - """Define a handler to fire when the websocket is connected.""" - _LOGGER.info("Connected to websocket") - _LOGGER.debug("Websocket watchdog starting") - if self._websocket_watchdog_listener is not None: - self._websocket_watchdog_listener() - self._websocket_watchdog_listener = async_call_later( - self._hass, DEFAULT_WATCHDOG_SECONDS, self._async_websocket_reconnect - ) - - def on_disconnect(): - """Define a handler to fire when the websocket is disconnected.""" - _LOGGER.info("Disconnected from websocket") - - def on_event(data): - """Define a handler to fire when a new SimpliSafe event arrives.""" - event = SimpliSafeWebsocketEvent(data) - _LOGGER.debug("New websocket event: %s", event) - self.last_events[data["sid"]] = event - async_dispatcher_send(self._hass, TOPIC_UPDATE.format(data["sid"])) - - _LOGGER.debug("Resetting websocket watchdog") - self._websocket_watchdog_listener() - self._websocket_watchdog_listener = async_call_later( - self._hass, DEFAULT_WATCHDOG_SECONDS, self._async_websocket_reconnect - ) - self._websocket_reconnect_delay = DEFAULT_SOCKET_MIN_RETRY - - self._websocket.on_connect(on_connect) - self._websocket.on_disconnect(on_disconnect) - self._websocket.on_event(on_event) + self._websocket.on_connect(self._on_connect) + self._websocket.on_disconnect(self._on_disconnect) + self._websocket.on_event(self._on_event) await self._async_attempt_websocket_connect()