plugwise 1.7.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

plugwise/__init__.py

@@ -80,7 +80,7 @@ class Smile(SmileComm):
         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 @@ class Smile(SmileComm):
         """
         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 @@ class SmileHelper(SmileCommon):
         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 @@ class SmileHelper(SmileCommon):
 
         # 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 @@ class SmileLegacyHelper(SmileCommon):
         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)
 
@@ -306,7 +306,7 @@ class SmileLegacyHelper(SmileCommon):
         search = self._modules
         mod_logs = search.findall("./module/services")
         for loc.measurement, loc.attrs in P1_LEGACY_MEASUREMENTS.items():
-            loc.meas_list = loc.measurement.split("_")
+            loc.meas_list = loc.measurement.partition("_")[0::2]
             for loc.logs in mod_logs:
                 for loc.log_type in mod_list:
                     collect_power_values(data, loc, t_string, legacy=True)

plugwise/legacy/smile.py

@@ -50,7 +50,7 @@ class SmileLegacyAPI(SmileLegacyData):
         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 @@ class SmileAPI(SmileData):
         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

plugwise/util.py

@@ -218,7 +218,7 @@ def get_vendor_name(module: etree, model_data: ModuleData) -> ModuleData:
     if (vendor_name := module.find("vendor_name").text) is not None:
         model_data["vendor_name"] = vendor_name
         if "Plugwise" in vendor_name:
-            model_data["vendor_name"] = vendor_name.split(" ", 1)[0]
+            model_data["vendor_name"] = vendor_name.partition(" ")[0]
 
     return model_data
 
@@ -275,9 +275,9 @@ def power_data_peak_value(loc: Munch, legacy: bool) -> Munch:
         if not loc.found:
             return loc
 
-    if (peak := loc.peak_select.split("_")[1]) == "offpeak":
+    if (peak := loc.peak_select.partition("_")[2]) == "offpeak":
         peak = "off_peak"
-    log_found = loc.log_type.split("_")[0]
+    log_found = loc.log_type.partition("_")[0]
     loc.key_string = f"{loc.measurement}_{peak}_{log_found}"
     if "gas" in loc.measurement or loc.log_type == "point_meter":
         loc.key_string = f"{loc.measurement}_{log_found}"
@@ -314,7 +314,7 @@ def skip_obsolete_measurements(xml: etree, measurement: str) -> bool:
         measurement in OBSOLETE_MEASUREMENTS
         and (updated_date_key := xml.find(locator)) is not None
     ):
-        updated_date = updated_date_key.text.split("T")[0]
+        updated_date = updated_date_key.text.partition("T")[0]
         date_1 = dt.datetime.strptime(updated_date, "%Y-%m-%d")
         date_2 = dt.datetime.now()
         return int((date_2 - date_1).days) > 7

{plugwise-1.7.0.dist-info → plugwise-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: plugwise
-Version: 1.7.0
+Version: 1.7.1
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

plugwise-1.7.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+plugwise/__init__.py,sha256=hLwUqdGAo39LzTXYz6Lkua_9RelJx5k-uAeJSrZdfYk,17760
+plugwise/common.py,sha256=_41FLLjgccaHjaV0Ndn1YEkxjB_qKev1k3ZnhSUzXjc,9305
+plugwise/constants.py,sha256=Vd8tvOHsRtZxtUUFXBXolZj3QiKnxRt0bnwDT9DoEqE,17073
+plugwise/data.py,sha256=ITGnS5RiRbd3O2KbYLc9_5okw81zLl7azXNXtuTwaoY,13022
+plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
+plugwise/helper.py,sha256=v8qXFau2bXnJ4xGde9NuljA-LLEWSL1SJVcnXQX-jiE,39397
+plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plugwise/smile.py,sha256=J8_CevN7FSYnAccYv4Hp_H3o9lfHGM_fYlLYAvuqJKw,18921
+plugwise/smilecomm.py,sha256=aQ2KkebDTou18k-flrVmTnFkgls33Xu8D9ZZQQt2R5k,5178
+plugwise/util.py,sha256=d3nOS9fzZ1MwJX8_77KOgW3CtQnGYc0oGcnqHrlxlLo,11015
+plugwise/legacy/data.py,sha256=s2WYjgxwcuAGS8UOxJVf7xLSxS38Zgr8GsjxlxfD98w,3574
+plugwise/legacy/helper.py,sha256=CjLGUhWRgNCOyooVyylLABdv0H2zoiKzjhQ-g7E8x9M,17059
+plugwise/legacy/smile.py,sha256=aCG5uaOCS4GOGfIbxTp8U-CFE3Cib-UspB4qSamm_eY,11659
+plugwise-1.7.1.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.7.1.dist-info/METADATA,sha256=Dnc7KdcTcDjT33JYXSkkDkHXkxKHXEet2gXQcQpSuyo,9148
+plugwise-1.7.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+plugwise-1.7.1.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.7.1.dist-info/RECORD,,

plugwise-1.7.0.dist-info/RECORD

@@ -1,18 +0,0 @@
-plugwise/__init__.py,sha256=fyot91I4cMkgo_8fL1hycRXwGBDecUq9ltxLAfSY-2U,17762
-plugwise/common.py,sha256=_41FLLjgccaHjaV0Ndn1YEkxjB_qKev1k3ZnhSUzXjc,9305
-plugwise/constants.py,sha256=Vd8tvOHsRtZxtUUFXBXolZj3QiKnxRt0bnwDT9DoEqE,17073
-plugwise/data.py,sha256=ITGnS5RiRbd3O2KbYLc9_5okw81zLl7azXNXtuTwaoY,13022
-plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
-plugwise/helper.py,sha256=dsdPpwJHiZ3DQoTc7kWoOiFVPvRda5u1GRJwAEDxuBk,39388
-plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plugwise/smile.py,sha256=I8lssyqmq_PF8ptLxk3daS7lf20kXr5Z3L7SYg3S9j4,18928
-plugwise/smilecomm.py,sha256=aQ2KkebDTou18k-flrVmTnFkgls33Xu8D9ZZQQt2R5k,5178
-plugwise/util.py,sha256=7OPtC4FDbAweAqad6b-6tKtMlSSQd3OU7g5-0lplF34,11002
-plugwise/legacy/data.py,sha256=s2WYjgxwcuAGS8UOxJVf7xLSxS38Zgr8GsjxlxfD98w,3574
-plugwise/legacy/helper.py,sha256=GslPqZL0gAAnqJVy-Ydp_U-eGQ5jYhz9F_Y15BfQgt4,17056
-plugwise/legacy/smile.py,sha256=TxjqRf7KIecECt48iHgSFI7bIOEHNkf4desSBVo1l-M,11666
-plugwise-1.7.0.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.7.0.dist-info/METADATA,sha256=ZWR9Mhkp1CknISTs1adzs9jePeIWqW9M89qMnUyvGI8,9148
-plugwise-1.7.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-plugwise-1.7.0.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.7.0.dist-info/RECORD,,