From f86083cf52d7bbb45df290bed2d4bef436a877d0 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 19 Nov 2018 20:48:26 +0100 Subject: [PATCH] Fix MQTT async_added_to_hass (#18575) * Fix some invocations * Update manual_mqtt.py --- .../components/alarm_control_panel/manual_mqtt.py | 9 +++------ homeassistant/components/camera/mqtt.py | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/alarm_control_panel/manual_mqtt.py b/homeassistant/components/alarm_control_panel/manual_mqtt.py index 834a502baa01f5..fc59ac4d08844c 100644 --- a/homeassistant/components/alarm_control_panel/manual_mqtt.py +++ b/homeassistant/components/alarm_control_panel/manual_mqtt.py @@ -335,11 +335,8 @@ def device_state_attributes(self): return state_attr - def async_added_to_hass(self): - """Subscribe to MQTT events. - - This method must be run in the event loop and returns a coroutine. - """ + async def async_added_to_hass(self): + """Subscribe to MQTT events.""" async_track_state_change( self.hass, self.entity_id, self._async_state_changed_listener ) @@ -359,7 +356,7 @@ def message_received(topic, payload, qos): _LOGGER.warning("Received unexpected payload: %s", payload) return - return mqtt.async_subscribe( + await mqtt.async_subscribe( self.hass, self._command_topic, message_received, self._qos) async def _async_state_changed_listener(self, entity_id, old_state, diff --git a/homeassistant/components/camera/mqtt.py b/homeassistant/components/camera/mqtt.py index 42ad7d6fa66384..7bda891e921773 100644 --- a/homeassistant/components/camera/mqtt.py +++ b/homeassistant/components/camera/mqtt.py @@ -89,13 +89,12 @@ def unique_id(self): """Return a unique ID.""" return self._unique_id - @asyncio.coroutine - def async_added_to_hass(self): + async def async_added_to_hass(self): """Subscribe MQTT events.""" @callback def message_received(topic, payload, qos): """Handle new MQTT messages.""" self._last_image = payload - return mqtt.async_subscribe( + await mqtt.async_subscribe( self.hass, self._topic, message_received, self._qos, None)