Remove self.smile_fw_version, only use smile_version

Author: bouwew

plugwise/__init__.py

@@ -75,7 +75,6 @@ def __init__(
         self._target_smile: str = NONE
         self.cooling_present = False
         self.gw_data: GatewayData = {}
-        self.smile_fw_version: Version | None = None
         self.smile_hostname: str = NONE
         self.smile_hw_version: str | None = None
         self.smile_legacy = False
@@ -160,7 +159,6 @@ async def connect(self) -> Version | None:
                 self._opentherm_device,
                 self._schedule_old_states,
                 self.gw_data,
-                self.smile_fw_version,
                 self.smile_hostname,
                 self.smile_hw_version,
                 self.smile_mac_address,
@@ -180,13 +178,13 @@ async def connect(self) -> Version | None:
                 self._stretch_v2,
                 self._target_smile,
                 self.gw_data,
-                self.smile_fw_version,
                 self.smile_hostname,
                 self.smile_hw_version,
                 self.smile_mac_address,
                 self.smile_model,
                 self.smile_name,
                 self.smile_type,
+                self.smile_version,
                 self.smile_zigbee_mac_address,
             )
         )
@@ -205,23 +203,23 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
         if (gateway := result.find("./gateway")) is not None:
             if (v_model := gateway.find("vendor_model")) is not None:
                 model = v_model.text
-            self.smile_fw_version = parse(gateway.find("firmware_version").text)
+            self.smile_version = parse(gateway.find("firmware_version").text)
             self.smile_hw_version = gateway.find("hardware_version").text
             self.smile_hostname = gateway.find("hostname").text
             self.smile_mac_address = gateway.find("mac_address").text
             self.smile_model_id = gateway.find("vendor_model").text
         else:
             model = await self._smile_detect_legacy(result, dsmrmain, model)
 
-        if model == "Unknown" or self.smile_fw_version is None:  # pragma: no cover
+        if model == "Unknown" or self.smile_version is None:  # pragma: no cover
             # Corner case check
             LOGGER.error(
                 "Unable to find model or version information, please create"
                 " an issue on http://github.com/plugwise/python-plugwise"
             )
             raise UnsupportedDeviceError
 
-        version_major = str(self.smile_fw_version.major)
+        version_major = str(self.smile_version.major)
         self._target_smile = f"{model}_v{version_major}"
         LOGGER.debug("Plugwise identified as %s", self._target_smile)
         if self._target_smile not in SMILES:
@@ -245,7 +243,6 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
         self.smile_model = "Gateway"
         self.smile_name = SMILES[self._target_smile].smile_name
         self.smile_type = SMILES[self._target_smile].smile_type
-        self.smile_version = self.smile_fw_version
 
         if self.smile_type == "stretch":
             self._stretch_v2 = int(version_major) == 2
@@ -294,7 +291,7 @@ async def _smile_detect_legacy(
             or network is not None
         ):
             system = await self._request(SYSTEM)
-            self.smile_fw_version = parse(system.find("./gateway/firmware").text)
+            self.smile_version = parse(system.find("./gateway/firmware").text)
             return_model = system.find("./gateway/product").text
             self.smile_hostname = system.find("./gateway/hostname").text
             # If wlan0 contains data it's active, so eth0 should be checked last
@@ -305,7 +302,7 @@ async def _smile_detect_legacy(
         # P1 legacy:
         elif dsmrmain is not None:
             status = await self._request(STATUS)
-            self.smile_fw_version = parse(status.find("./system/version").text)
+            self.smile_version = parse(status.find("./system/version").text)
             return_model = status.find("./system/product").text
             self.smile_hostname = status.find("./network/hostname").text
             self.smile_mac_address = status.find("./network/mac_address").text

plugwise/helper.py

@@ -110,7 +110,6 @@ def __init__(self) -> None:
         self._cooling_enabled = False
 
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.smile_fw_version: version.Version | None
         self.smile_hw_version: str | None
         self.smile_mac_address: str | None
         self.smile_model: str
@@ -288,7 +287,7 @@ def _appliance_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 = str(self.smile_fw_version)
+        appl.firmware = str(self.smile_version)
         appl.hardware = self.smile_hw_version
         appl.mac = self.smile_mac_address
         appl.model = self.smile_model

plugwise/legacy/helper.py

@@ -82,12 +82,12 @@ def __init__(self) -> None:
         self.cooling_present: bool
         self.gateway_id: str
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.smile_fw_version: Version | None
         self.smile_hw_version: str | None
         self.smile_mac_address: str | None
         self.smile_model: str
         self.smile_name: str
         self.smile_type: str
+        self.smile_version: Version | None
         self.smile_zigbee_mac_address: str | None
         SmileCommon.__init__(self)
 
@@ -193,7 +193,7 @@ def _create_legacy_gateway(self) -> None:
         self.gw_entities[self.gateway_id] = {"dev_class": "gateway"}
         self._count += 1
         for key, value in {
-            "firmware": str(self.smile_fw_version),
+            "firmware": str(self.smile_version),
             "location": self._home_loc_id,
             "mac_address": self.smile_mac_address,
             "model": self.smile_model,

plugwise/legacy/smile.py

@@ -45,13 +45,13 @@ def __init__(
         _stretch_v2: bool,
         _target_smile: str,
         gw_data: GatewayData,
-        smile_fw_version: Version | None,
         smile_hostname: str,
         smile_hw_version: str | None,
         smile_mac_address: str | None,
         smile_model: str,
         smile_name: str,
         smile_type: str,
+        smile_version: Version | None,
         smile_zigbee_mac_address: str | None,
     ) -> None:
         """Set the constructor for this class."""
@@ -64,13 +64,13 @@ def __init__(
         self.cooling_present = False
         self.gw_data = gw_data
         self.request = request
-        self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
         self.smile_mac_address = smile_mac_address
         self.smile_model = smile_model
         self.smile_name = smile_name
         self.smile_type = smile_type
+        self.smile_version = smile_version
         self.smile_zigbee_mac_address = smile_zigbee_mac_address
         SmileLegacyData.__init__(self)
 

plugwise/smile.py

@@ -54,7 +54,6 @@ def __init__(
         _opentherm_device: bool,
         _schedule_old_states: dict[str, dict[str, str]],
         gw_data: GatewayData,
-        smile_fw_version: Version | None,
         smile_hostname: str | None,
         smile_hw_version: str | None,
         smile_mac_address: str | None,
@@ -78,7 +77,6 @@ def __init__(
         self._schedule_old_states = _schedule_old_states
         self.gw_data = gw_data
         self.request = request
-        self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
         self.smile_mac_address = smile_mac_address