Merge pull request #66 from nao-pon/finetune

Remove unnecessary assignments
hristo-atanasov · Mar 4, 2022 · 72a4389 · 72a4389
2 parents 8b48f15 + 7d75e79
commit 72a4389
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/custom_components/tasmota_irhvac/climate.py b/custom_components/tasmota_irhvac/climate.py
@@ -652,34 +652,30 @@ async def state_message_received(msg):
                     state = self.hass.states.get(self._power_sensor)
                     await self._async_power_sensor_changed(self._power_sensor, None, state)
 
-        if hasattr(mqtt.subscription, 'async_prepare_subscribe_topics'):
-            self._sub_state = mqtt.subscription.async_prepare_subscribe_topics(
-                self.hass,
-                self._sub_state,
-                {
+        topics = {
                     CONF_STATE_TOPIC: {
                         "topic": self.state_topic,
                         "msg_callback": state_message_received,
                         "qos": 1,
                     }
-                },
-            )
+                }
 
-            self._sub_state = await mqtt.subscription.async_subscribe_topics(
+        if hasattr(mqtt.subscription, 'async_prepare_subscribe_topics'):
+            # for HA Core >= 2022.3.0
+            self._sub_state = mqtt.subscription.async_prepare_subscribe_topics(
                 self.hass,
-                self._sub_state
+                self._sub_state,
+                topics,
             )
+
+            await mqtt.subscription.async_subscribe_topics(self.hass, self._sub_state)
+
         else:
+            # for HA Core < 2022.3.0
             self._sub_state = await mqtt.subscription.async_subscribe_topics(
                 self.hass,
                 self._sub_state,
-                {
-                    CONF_STATE_TOPIC: {
-                        "topic": self.state_topic,
-                        "msg_callback": state_message_received,
-                        "qos": 1,
-                    }
-                },
+                topics,
             )
 
     async def async_will_remove_from_hass(self):