Revert back to returning None's

Author: bouwew

plugwise/__init__.py

@@ -398,10 +398,10 @@ async def set_temperature_offset(self, dev_id: str, offset: float) -> None:
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
-    ) -> bool:
+    ) -> None:
         """Set the given State of the relevant Switch."""
         try:
-            return await self._smile_api.set_switch_state(
+            await self._smile_api.set_switch_state(
                 appl_id, members, model, state
             )
         except ConnectionFailedError as exc:

plugwise/legacy/smile.py

@@ -235,16 +235,14 @@ async def set_schedule_state(
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
-    ) -> bool:
+    ) -> None:
         """Set the given state of the relevant switch.
 
         For individual switches, sets the state directly.
         For group switches, sets the state for each member in the group separately.
         For switch-locks, sets the lock state using a different data format.
         Return the requested state when succesful, the current state otherwise.
         """
-        current_state = self.gw_entities[appl_id]["switches"]["relay"]
-        requested_state = state == STATE_ON
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.func_type = "relay_functionality"
@@ -273,7 +271,6 @@ async def set_switch_state(
                 "</appliances>"
             )
             await self.call_request(APPLIANCES, method="post", data=data)
-            return requested_state
 
         # Handle group of switches
         data = f"<{switch.func_type}><state>{state}</state></{switch.func_type}>"
@@ -284,12 +281,11 @@ async def set_switch_state(
 
         # Handle individual relay switches
         uri = f"{APPLIANCES};id={appl_id}/relay"
-        if model == "relay" and self.gw_entities[appl_id]["switches"]["lock"]:
+        if model == "relay" and self.gw_entities[appl_id]["switches"].get("lock"):
             # Don't bother switching a relay when the corresponding lock-state is true
-            return current_state
+            return None
 
         await self.call_request(uri, method="put", data=data)
-        return requested_state
 
     async def _set_groupswitch_member_state(
         self, appl_id: str, data: str, members: list[str], state: str, switch: Munch
@@ -299,19 +295,10 @@ async def _set_groupswitch_member_state(
         Set the given State of the relevant Switch (relay) within a group of members.
         Return the requested state when at least one requested change was succesful, the current state otherwise.
         """
-        current_state = self.gw_entities[appl_id]["switches"]["relay"]
-        requested_state = state == STATE_ON
-        switched = 0
         for member in members:
-            if not self.gw_entities[member]["switches"]["lock"]:
+            if not self.gw_entities[member]["switches"].get("lock"):
                 uri = f"{APPLIANCES};id={member}/relay"
                 await self.call_request(uri, method="put", data=data)
-                switched += 1
-
-        if switched > 0:
-            return requested_state
-
-        return current_state  # pragma: no cover
 
     async def set_temperature(self, _: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""

plugwise/smile.py

@@ -379,14 +379,11 @@ def determine_contexts(
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
-    ) -> bool:
+    ) -> None:
         """Set the given State of the relevant Switch.
 
         Return the requested state when succesful, the current state otherwise.
         """
-        model_type = cast(SwitchType, model)
-        current_state = self.gw_entities[appl_id]["switches"][model_type]
-        requested_state = state == STATE_ON
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.device = "relay"
@@ -434,34 +431,24 @@ async def set_switch_state(
             if lock_blocked or lock_blocked is None:
                 # Don't switch a relay when its corresponding lock-state is true or no
                 # lock is present. That means the relay can't be controlled by the user.
-                return current_state
+                return None
 
         await self.call_request(uri, method="put", data=data)
-        return requested_state
 
     async def _set_groupswitch_member_state(
         self, appl_id: str, data: str, members: list[str], state: str, switch: Munch
-    ) -> bool:
+    ) -> None:
         """Helper-function for set_switch_state().
 
         Set the given State of the relevant Switch within a group of members.
         Return the requested state when at least one requested change was succesful, the current state otherwise.
         """
-        current_state = self.gw_entities[appl_id]["switches"]["relay"]
-        requested_state = state == STATE_ON
-        switched = 0
         for member in members:
             locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}'
             switch_id = self._domain_objects.find(locator).attrib["id"]
             uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}"
             if not self.gw_entities[member]["switches"].get("lock"):
                 await self.call_request(uri, method="put", data=data)
-                switched += 1
-
-        if switched > 0:
-            return requested_state
-
-        return current_state
 
     async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""