Merge pull request zacs#65 from zacs/hotfix/deprecation_warnings

Updated Integration to work in newer versions (>=2024.1)

custom_components/dualmode_generic/climate.py

@@ -17,24 +17,16 @@
     ATTR_TARGET_TEMP_LOW,
     ATTR_TARGET_TEMP_HIGH,
     ATTR_TARGET_TEMP_STEP,
-    CURRENT_HVAC_COOL,
-    CURRENT_HVAC_HEAT,
-    CURRENT_HVAC_FAN,
-    CURRENT_HVAC_DRY,
-    CURRENT_HVAC_IDLE,
-    CURRENT_HVAC_OFF,
-    HVAC_MODE_COOL,
-    HVAC_MODE_HEAT,
-    HVAC_MODE_FAN_ONLY,
-    HVAC_MODE_DRY,
-    HVAC_MODE_OFF,
-    HVAC_MODE_HEAT_COOL,
     PRESET_AWAY,
-    SUPPORT_PRESET_MODE,
-    SUPPORT_TARGET_TEMPERATURE,
-    SUPPORT_TARGET_TEMPERATURE_RANGE,
     PRESET_NONE,
 )
+
+from homeassistant.components.climate.const import (
+    ClimateEntityFeature,
+    HVACMode,
+    HVACAction,
+)
+
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_TEMPERATURE,
@@ -64,6 +56,27 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+# CONSTANTS from Enum to adhere to the new ClimateEntityFeature
+HVAC_MODE_COOL = HVACMode.COOL
+HVAC_MODE_HEAT = HVACMode.HEAT
+HVAC_MODE_FAN_ONLY = HVACMode.FAN_ONLY
+HVAC_MODE_DRY = HVACMode.DRY
+HVAC_MODE_OFF = HVACMode.OFF
+HVAC_MODE_HEAT_COOL = HVACMode.HEAT_COOL
+
+CURRENT_HVAC_COOL = HVACAction.COOLING
+CURRENT_HVAC_HEAT = HVACAction.HEATING
+CURRENT_HVAC_FAN = HVACAction.FAN
+CURRENT_HVAC_DRY = HVACAction.DRYING
+CURRENT_HVAC_IDLE = HVACAction.IDLE
+CURRENT_HVAC_OFF = HVACAction.OFF
+
+SUPPORT_TARGET_TEMPERATURE = ClimateEntityFeature.TARGET_TEMPERATURE
+SUPPORT_TARGET_TEMPERATURE_RANGE = ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+SUPPORT_PRESET_MODE = ClimateEntityFeature.PRESET_MODE
+# END OF CONSTANTS
+
+
 DEFAULT_TOLERANCE = 0.3
 DEFAULT_NAME = "Generic Thermostat"
 
@@ -262,6 +275,9 @@ def __init__(
         self.dryer_entity_id = dryer_entity_id
         self.dryer_behavior = dryer_behavior
 
+        # Tell Home Assistant that this integration is migrated
+        self._enable_turn_on_off_backwards_compatibility = False
+
         # This part allows previous users of the integration to update seamlessly #
         if True in reverse_cycle:
             self.reverse_cycle = [REVERSE_CYCLE_IS_HEATER, REVERSE_CYCLE_IS_COOLER]
@@ -416,7 +432,8 @@ def _async_startup(event=None):
         if old_state is not None:
             # If we have no initial temperature, restore
             if (self._target_temp is None and old_state.state != HVAC_MODE_HEAT_COOL) or (
-                (self._target_temp_low is None or self._target_temp_high is None) and old_state.state == HVAC_MODE_HEAT_COOL
+                    (
+                            self._target_temp_low is None or self._target_temp_high is None) and old_state.state == HVAC_MODE_HEAT_COOL
             ):
                 # If we have a previously saved temperature
                 if old_state.attributes.get(ATTR_TEMPERATURE) is None:
@@ -437,7 +454,8 @@ def _async_startup(event=None):
                 else:
                     self._target_temp = float(old_state.attributes[ATTR_TEMPERATURE])
                 # If we have a previously saved min and max temperatures
-                if old_state.attributes.get(ATTR_TARGET_TEMP_LOW) is None or old_state.attributes.get(ATTR_TARGET_TEMP_HIGH) is None:
+                if old_state.attributes.get(ATTR_TARGET_TEMP_LOW) is None or old_state.attributes.get(
+                        ATTR_TARGET_TEMP_HIGH) is None:
                     self._target_temp_high = self.max_temp
                     self._target_temp_low = self.min_temp
                     _LOGGER.warning(
@@ -520,7 +538,7 @@ def target_temperature_step(self):
             return self._temp_target_temperature_step
         # if a target_temperature_step is not defined, fallback to equal the precision
         return self.precision
-    
+
     @property
     def temperature_unit(self):
         """Return the unit of measurement."""
@@ -599,7 +617,8 @@ def preset_mode(self):
     @property
     def preset_modes(self):
         """Return a list of available preset modes or PRESET_NONE if _away_temp or (_away_temp_heater and _away_temp_cooler) are undefined."""
-        return [PRESET_NONE, PRESET_AWAY] if (self._away_temp or (self._away_temp_heater and self._away_temp_cooler)) else PRESET_NONE
+        return [PRESET_NONE, PRESET_AWAY] if (
+                self._away_temp or (self._away_temp_heater and self._away_temp_cooler)) else PRESET_NONE
 
     async def async_set_hvac_mode(self, hvac_mode):
         """Set hvac mode."""