Move power_data_local_format() to util.py

Author: bouwew

plugwise/helper.py

@@ -63,6 +63,7 @@
 from plugwise.util import (
     escape_illegal_xml_characters,
     format_measure,
+    power_data_local_format,
     version_to_model,
 )
 
@@ -84,19 +85,6 @@ def check_model(name: str | None, vendor_name: str | None) -> str | None:
     return name
 
 
-def power_data_local_format(
-    attrs: dict[str, str], key_string: str, val: str
-) -> float | int:
-    """Format power data."""
-    # Special formatting of P1_MEASUREMENT POWER_WATT values, do not move to util-format_measure() function!
-    if all(item in key_string for item in ("electricity", "cumulative")):
-        return format_measure(val, ENERGY_KILO_WATT_HOUR)
-    if (attrs_uom := getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)) == POWER_WATT:
-        return int(round(float(val)))
-
-    return format_measure(val, attrs_uom)
-
-
 class SmileComm:
     """The SmileComm class."""
 

plugwise/legacy/helper.py

@@ -48,7 +48,7 @@
     SwitchType,
     ThermoLoc,
 )
-from plugwise.util import format_measure, version_to_model
+from plugwise.util import format_measure, power_data_local_format, version_to_model
 
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
 from defusedxml import ElementTree as etree
@@ -65,19 +65,6 @@ def etree_to_dict(element: etree) -> dict[str, str]:
     return node
 
 
-def power_data_local_format(
-    attrs: dict[str, str], key_string: str, val: str
-) -> float | int:
-    """Format power data."""
-    # Special formatting of P1_MEASUREMENT POWER_WATT values, do not move to util-format_measure() function!
-    if all(item in key_string for item in ("electricity", "cumulative")):
-        return format_measure(val, ENERGY_KILO_WATT_HOUR)
-    if (attrs_uom := getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)) == POWER_WATT:
-        return int(round(float(val)))
-
-    return format_measure(val, attrs_uom)
-
-
 class SmileLegacyHelper:
     """The SmileLegacyHelper class."""
 

plugwise/util.py

@@ -48,6 +48,19 @@ def format_measure(measure: str, unit: str) -> float | int:
     return result
 
 
+def power_data_local_format(
+    attrs: dict[str, str], key_string: str, val: str
+) -> float | int:
+    """Format power data."""
+    # Special formatting of P1_MEASUREMENT POWER_WATT values, do not move to util-format_measure() function!
+    if all(item in key_string for item in ("electricity", "cumulative")):
+        return format_measure(val, ENERGY_KILO_WATT_HOUR)
+    if (attrs_uom := getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)) == POWER_WATT:
+        return int(round(float(val)))
+
+    return format_measure(val, attrs_uom)
+
+
 # NOTE: this function version_to_model is shared between Smile and USB
 def version_to_model(version: str | None) -> str | None:
     """Translate hardware_version to device type."""