Merge pull request #699 from plugwise/nitpicks

Avoid None-init for smile_version

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- Avoid None-init for smile_version [#699](https://github.com/plugwise/python-plugwise/pull/699)
+
 ## v1.7.0
 
 - Continuous improvements [#678](https://github.com/plugwise/python-plugwise/pull/678)

plugwise/__init__.py

@@ -80,7 +80,7 @@ def __init__(
         self.smile_model_id: str | None = None
         self.smile_name: str = NONE
         self.smile_type: str = NONE
-        self.smile_version: Version | None = None
+        self.smile_version: Version = Version("0.0.0")
         self.smile_zigbee_mac_address: str | None = None
 
     @property
@@ -115,7 +115,7 @@ def reboot(self) -> bool:
         """
         return not self.smile_legacy
 
-    async def connect(self) -> Version | None:
+    async def connect(self) -> Version:
         """Connect to the Plugwise Gateway and determine its name, type, version, and other data."""
         result = await self._request(DOMAIN_OBJECTS)
         # Work-around for Stretch fw 2.7.18

plugwise/helper.py

@@ -86,7 +86,7 @@ def __init__(self) -> None:
         self.smile_mac_address: str | None
         self.smile_model: str
         self.smile_model_id: str | None
-        self.smile_version: version.Version | None
+        self.smile_version: version.Version
         SmileCommon.__init__(self)
 
     def _all_appliances(self) -> None:
@@ -786,7 +786,7 @@ def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:
 
         # Handle missing control_state in regulation_mode off for firmware >= 3.2.0 (issue #776)
         # In newer firmware versions, default to "off" when control_state is not present
-        if self.smile_version is not None:
+        if self.smile_version != version.Version("0.0.0"):
             if self.smile_version >= version.parse("3.2.0"):
                 return "off"
 

plugwise/legacy/helper.py

@@ -72,7 +72,7 @@ def __init__(self) -> None:
         self.gw_entities: dict[str, GwEntityData] = {}
         self.smile_mac_address: str | None
         self.smile_model: str
-        self.smile_version: Version | None
+        self.smile_version: Version
         self.smile_zigbee_mac_address: str | None
         SmileCommon.__init__(self)
 

plugwise/legacy/smile.py

@@ -50,7 +50,7 @@ def __init__(
         smile_model: str,
         smile_name: str,
         smile_type: str,
-        smile_version: Version | None,
+        smile_version: Version,
         smile_zigbee_mac_address: str | None,
     ) -> None:
         """Set the constructor for this class."""

plugwise/smile.py

@@ -59,7 +59,7 @@ def __init__(
         smile_model_id: str | None,
         smile_name: str,
         smile_type: str,
-        smile_version: Version | None,
+        smile_version: Version,
     ) -> None:
         """Set the constructor for this class."""
         self._cooling_present = _cooling_present