Translate back to str

Author: bouwew

plugwise/helper.py

@@ -62,6 +62,7 @@
 from dateutil.parser import parse
 from defusedxml import ElementTree as etree
 from munch import Munch
+from packaging.version import Version
 
 
 class SmileComm:
@@ -250,7 +251,7 @@ def __init__(self) -> None:
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
         self.loc_data: dict[str, ThermoLoc]
-        self.smile_fw_version: str | None
+        self.smile_fw_version: Version | None
         self.smile_hw_version: str | None
         self.smile_mac_address: str | None
         self.smile_model: str
@@ -425,7 +426,7 @@ def _energy_device_info_finder(self, appl: Munch, appliance: etree) -> Munch:
     def _appl_gateway_info(self, appl: Munch, appliance: etree) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         self.gateway_id = appliance.attrib["id"]
-        appl.firmware = self.smile_fw_version
+        appl.firmware = str(self.smile_fw_version)
         appl.hardware = self.smile_hw_version
         appl.mac = self.smile_mac_address
         appl.model = self.smile_model

plugwise/legacy/helper.py

@@ -44,6 +44,7 @@
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
 from defusedxml import ElementTree as etree
 from munch import Munch
+from packaging.version import Version
 
 
 def etree_to_dict(element: etree) -> dict[str, str]:
@@ -81,7 +82,7 @@ def __init__(self) -> None:
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
         self.loc_data: dict[str, ThermoLoc]
-        self.smile_fw_version: str | None
+        self.smile_fw_version: Version | None
         self.smile_hw_version: str | None
         self.smile_mac_address: str | None
         self.smile_model: str
@@ -194,7 +195,7 @@ def _create_legacy_gateway(self) -> None:
         self.gw_devices[self.gateway_id] = {"dev_class": "gateway"}
         self._count += 1
         for key, value in {
-            "firmware": self.smile_fw_version,
+            "firmware": str(self.smile_fw_version),
             "location": self._home_location,
             "mac_address": self.smile_mac_address,
             "model": self.smile_model,