Improve var-name, correct returns

Author: bouwew

plugwise/legacy/smile.py

@@ -242,7 +242,7 @@ async def set_switch_state(
         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.
         """
-        req_state = state == STATE_ON
+        requested_state = state == STATE_ON
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.func_type = "relay_functionality"
@@ -271,7 +271,7 @@ async def set_switch_state(
                 "</appliances>"
             )
             await self.call_request(APPLIANCES, method="post", data=data)
-            return req_state
+            return requested_state
 
         # Handle group of switches
         data = f"<{switch.func_type}><state>{state}</state></{switch.func_type}>"
@@ -284,10 +284,10 @@ async def set_switch_state(
         uri = f"{APPLIANCES};id={appl_id}/relay"
         if model == "relay" and self.gw_entities[appl_id]["switches"]["lock"]:
             # Don't bother switching a relay when the corresponding lock-state is true
-            return False
+            return not requested_state
 
         await self.call_request(uri, method="put", data=data)
-        return req_state
+        return requested_state
 
     async def _set_groupswitch_member_state(
         self, data: str, members: list[str], state: str, switch: Munch
@@ -296,7 +296,7 @@ async def _set_groupswitch_member_state(
 
         Set the given State of the relevant Switch (relay) within a group of members.
         """
-        req_state = state == STATE_ON
+        requested_state = state == STATE_ON
         switched = 0
         for member in members:
             if not self.gw_entities[member]["switches"]["lock"]:
@@ -305,9 +305,9 @@ async def _set_groupswitch_member_state(
                 switched += 1
 
         if switched > 0:
-            return req_state
-        else:
-            return not req_state  # pragma: no cover
+            return requested_state
+
+        return not requested_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

@@ -380,7 +380,7 @@ async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
     ) -> bool:
         """Set the given State of the relevant Switch."""
-        req_state = state == STATE_ON
+        requested_state = state == STATE_ON
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.device = "relay"
@@ -422,10 +422,10 @@ async def set_switch_state(
         uri = f"{APPLIANCES};id={appl_id}/{switch.device};id={switch_id}"
         if model == "relay" and self.gw_entities[appl_id]["switches"]["lock"]:
             # Don't switch a relay when its corresponding lock-state is true
-            return False
+            return not requested_state
 
         await self.call_request(uri, method="put", data=data)
-        return req_state
+        return requested_state
 
     async def _set_groupswitch_member_state(
         self, members: list[str], state: str, switch: Munch
@@ -434,7 +434,7 @@ async def _set_groupswitch_member_state(
 
         Set the given State of the relevant Switch within a group of members.
         """
-        req_state = state == STATE_ON
+        requested_state = state == STATE_ON
         switched = 0
         for member in members:
             locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}'
@@ -450,9 +450,9 @@ async def _set_groupswitch_member_state(
                 switched += 1
 
         if switched > 0:
-            return req_state
-        else:
-            return not req_state
+            return requested_state
+
+        return not requested_state
 
     async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""