Move check_model(), fix imports

Author: bouwew

plugwise/helper.py

@@ -20,7 +20,6 @@
     DEVICE_MEASUREMENTS,
     DHW_SETPOINT,
     DOMAIN_OBJECTS,
-    ENERGY_KILO_WATT_HOUR,
     ENERGY_WATT_HOUR,
     HEATER_CENTRAL_MEASUREMENTS,
     LIMITS,
@@ -30,7 +29,6 @@
     OBSOLETE_MEASUREMENTS,
     OFF,
     P1_MEASUREMENTS,
-    POWER_WATT,
     SENSORS,
     SPECIAL_PLUG_TYPES,
     SPECIALS,
@@ -61,10 +59,10 @@
     ResponseError,
 )
 from plugwise.util import (
+    check_model,
     escape_illegal_xml_characters,
     format_measure,
     power_data_local_format,
-    version_to_model,
 )
 
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
@@ -77,14 +75,6 @@
 from munch import Munch
 
 
-def check_model(name: str | None, vendor_name: str | None) -> str | None:
-    """Model checking before using version_to_model."""
-    if vendor_name == "Plugwise" and ((model := version_to_model(name)) != "Unknown"):
-        return model
-
-    return name
-
-
 class SmileComm:
     """The SmileComm class."""
 

plugwise/legacy/helper.py

@@ -17,7 +17,6 @@
     BINARY_SENSORS,
     DATA,
     DEVICE_MEASUREMENTS,
-    ENERGY_KILO_WATT_HOUR,
     ENERGY_WATT_HOUR,
     FAKE_APPL,
     FAKE_LOC,
@@ -26,7 +25,6 @@
     NONE,
     OBSOLETE_MEASUREMENTS,
     P1_LEGACY_MEASUREMENTS,
-    POWER_WATT,
     SENSORS,
     SPECIAL_PLUG_TYPES,
     SPECIALS,

plugwise/util.py

@@ -4,16 +4,26 @@
 import re
 
 from plugwise.constants import (
+    ATTR_UNIT_OF_MEASUREMENT,
     ELECTRIC_POTENTIAL_VOLT,
     ENERGY_KILO_WATT_HOUR,
     HW_MODELS,
     PERCENTAGE,
+    POWER_WATT,
     SPECIAL_FORMAT,
     TEMP_CELSIUS,
     DeviceData,
 )
 
 
+def check_model(name: str | None, vendor_name: str | None) -> str | None:
+    """Model checking before using version_to_model."""
+    if vendor_name == "Plugwise" and ((model := version_to_model(name)) != "Unknown"):
+        return model
+
+    return name
+
+
 def escape_illegal_xml_characters(xmldata: str) -> str:
     """Replace illegal &-characters."""
     return re.sub(r"&([^a-zA-Z#])", r"&\1", xmldata)