Break out _create_special_dicts() as common function

Author: bouwew

plugwise/common.py

@@ -9,11 +9,13 @@
 
 from plugwise.constants import (
     ANNA,
+    DHW_SETPOINT,
     GROUP_TYPES,
     NONE,
     PRIORITY_DEVICE_CLASSES,
     SPECIAL_PLUG_TYPES,
     SWITCH_GROUP_TYPES,
+    ActuatorData,
     ApplianceType,
     GwEntityData,
     ModuleData,
@@ -289,3 +291,31 @@ def _get_module_data(
             break
 
         return module_data
+
+    def _create_special_dicts(
+        self, item: str, data: GwEntityData, temp_dict: ActuatorData
+    ) -> tuple[str, ActuatorData]:
+        """Create dhw_temperature and boiler_temperature dicts.
+
+        The initial item-names are updated and a current key is added.
+        Also, the copied sensor data is removed.
+        """
+        if item == DHW_SETPOINT:
+            item = "dhw_temperature"
+            if DHW_SETPOINT in data["sensors"]:
+                data["sensors"].pop(DHW_SETPOINT)
+                self._count -= 1
+            if "dhw_temperature" in data["sensors"]:
+                temp_dict["current"] = data["sensors"]["dhw_temperature"]
+                data["sensors"].pop("dhw_temperature")
+            elif "water_temperature" in data["sensors"]:
+                temp_dict["current"] = data["sensors"]["water_temperature"]
+                self._count += 1
+
+        if item == "maximum_boiler_temperature":
+            item = "boiler_temperature"
+            if "water_temperature" in data["sensors"]:
+                temp_dict["current"] = data["sensors"]["water_temperature"]
+                data["sensors"].pop("water_temperature")
+
+        return item, temp_dict

plugwise/helper.py

@@ -18,7 +18,6 @@
     ATTR_NAME,
     DATA,
     DEVICE_MEASUREMENTS,
-    DHW_SETPOINT,
     DOMAIN_OBJECTS,
     ENERGY_WATT_HOUR,
     GROUP_MEASUREMENTS,
@@ -587,34 +586,6 @@ def _get_actuator_functionalities(
                 act_item = cast(ActuatorType, item)
                 data[act_item] = temp_dict
 
-    def _create_special_dicts(
-        self, item: str, data: GwEntityData, temp_dict: ActuatorData
-    ) -> tuple[str, ActuatorData]:
-        """Create dhw_temperature and boiler_temperature dicts.
-
-        The initial item-names are updated and a current key is added.
-        Also, the copied sensor data is removed.
-        """
-        if item == DHW_SETPOINT:
-            item = "dhw_temperature"
-            if DHW_SETPOINT in data["sensors"]:
-                data["sensors"].pop(DHW_SETPOINT)
-                self._count -= 1
-            if "dhw_temperature" in data["sensors"]:
-                temp_dict["current"] = data["sensors"]["dhw_temperature"]
-                data["sensors"].pop("dhw_temperature")
-            elif "water_temperature" in data["sensors"]:
-                temp_dict["current"] = data["sensors"]["water_temperature"]
-                self._count += 1
-
-        if item == "maximum_boiler_temperature":
-            item = "boiler_temperature"
-            if "water_temperature" in data["sensors"]:
-                temp_dict["current"] = data["sensors"]["water_temperature"]
-                data["sensors"].pop("water_temperature")
-
-        return item, temp_dict
-
     def _get_actuator_mode(
         self, appliance: etree.Element, entity_id: str, key: str
     ) -> str | None:

plugwise/legacy/helper.py

@@ -366,12 +366,7 @@ def _get_actuator_functionalities(
                     self._count += 1
 
             if temp_dict:
-                if item == "maximum_boiler_temperature":
-                    item = "boiler_temperature"
-                if "water_temperature" in data["sensors"]:
-                    temp_dict["current"] = data["sensors"]["water_temperature"]
-                    data["sensors"].pop("water_temperature")
-
+                item, temp_dict = self._create_special_dicts(item, data, temp_dict)
                 act_item = cast(ActuatorType, item)
                 data[act_item] = temp_dict