Fix issues reported by ruff RET rule in Python bindings (project-chip#42154)

Author: arkq

src/controller/python/matter/ChipBluezMgr.py

@@ -187,8 +187,7 @@ def adapter_bg_scan(self, enable):
     @property
     def Address(self):
         try:
-            result = self.adapter_properties.Get(ADAPTER_INTERFACE, "Address")
-            return result
+            return self.adapter_properties.Get(ADAPTER_INTERFACE, "Address")
         except dbus.exceptions.DBusException as ex:
             LOGGER.debug(str(ex))
             return None
@@ -455,8 +454,7 @@ def Address(self):
     @property
     def Name(self):
         try:
-            name = self.device_properties.Get(DEVICE_INTERFACE, "Name")
-            return name
+            return self.device_properties.Get(DEVICE_INTERFACE, "Name")
         except dbus.exceptions.DBusException as ex:
             LOGGER.debug(str(ex))
             return None
@@ -490,8 +488,7 @@ def TxPower(self):
     @property
     def RSSI(self):
         try:
-            result = self.device_properties.Get(DEVICE_INTERFACE, "RSSI")
-            return result
+            return self.device_properties.Get(DEVICE_INTERFACE, "RSSI")
         except dbus.exceptions.DBusException as ex:
             LOGGER.debug(str(ex))
             return None
@@ -559,10 +556,9 @@ def destroy(self):
     @property
     def uuid(self):
         try:
-            result = uuid.UUID(
+            return uuid.UUID(
                 str(self.service_properties.Get(SERVICE_INTERFACE, "UUID"))
             )
-            return result
         except dbus.exceptions.DBusException as ex:
             LOGGER.debug(str(ex))
             return None
@@ -573,9 +569,8 @@ def uuid(self):
     @property
     def Primary(self):
         try:
-            result = bool(self.service_properties.Get(
+            return bool(self.service_properties.Get(
                 SERVICE_INTERFACE, "Primary"))
-            return result
         except dbus.exceptions.DBusException as ex:
             LOGGER.debug(str(ex))
             return False
@@ -586,8 +581,7 @@ def Primary(self):
     @property
     def Device(self):
         try:
-            result = self.service_properties.Get(SERVICE_INTERFACE, "Device")
-            return result
+            return self.service_properties.Get(SERVICE_INTERFACE, "Device")
         except dbus.exceptions.DBusException as ex:
             LOGGER.debug(str(ex))
             return None
@@ -707,13 +701,12 @@ def WriteValue(self, value, options, reply_handler, error_handler, timeout):
     @property
     def uuid(self):
         try:
-            result = uuid.UUID(
+            return uuid.UUID(
                 str(
                     self.characteristic_properties.Get(
                         CHARACTERISTIC_INTERFACE, "UUID")
                 )
             )
-            return result
         except dbus.exceptions.DBusException as ex:
             LOGGER.debug(str(ex))
             return None

src/controller/python/matter/ChipCoreBluetoothMgr.py

@@ -213,7 +213,7 @@ def shouldLoop(self, cond: LoopCondition):
 
         if cond.op == "ready":
             return not self.ready_condition
-        elif cond.op == "scan":
+        if cond.op == "scan":
             for peripheral in self.peripheral_adv_list:
                 if cond.arg and str(peripheral.peripheral._.name) == cond.arg:
                     return False
@@ -444,13 +444,13 @@ def GetBleEvent(self):
             if isinstance(ev, BleRxEvent):
                 eventStruct = BleRxEventStruct.fromBleRxEvent(ev)
                 return cast(pointer(eventStruct), c_void_p).value
-            elif isinstance(ev, BleTxEvent):
+            if isinstance(ev, BleTxEvent):
                 eventStruct = BleTxEventStruct.fromBleTxEvent(ev)
                 return cast(pointer(eventStruct), c_void_p).value
-            elif isinstance(ev, BleSubscribeEvent):
+            if isinstance(ev, BleSubscribeEvent):
                 eventStruct = BleSubscribeEventStruct.fromBleSubscribeEvent(ev)
                 return cast(pointer(eventStruct), c_void_p).value
-            elif isinstance(ev, BleDisconnectEvent):
+            if isinstance(ev, BleDisconnectEvent):
                 eventStruct = BleDisconnectEventStruct.fromBleDisconnectEvent(
                     ev)
                 return cast(pointer(eventStruct), c_void_p).value

src/controller/python/matter/ChipDeviceCtrl.py

@@ -1519,9 +1519,8 @@ def ComputeRoundTripTimeout(self, nodeId: int, upperLayerProcessingTimeoutMs: in
             int: The computed timeout value in milliseconds, representing the round-trip time.
         '''
         device = self.GetConnectedDeviceSync(nodeId)
-        res = self._ChipStack.Call(lambda: self._dmLib.pychip_DeviceProxy_ComputeRoundTripTimeout(
+        return self._ChipStack.Call(lambda: self._dmLib.pychip_DeviceProxy_ComputeRoundTripTimeout(
             device.deviceProxy, upperLayerProcessingTimeoutMs))
-        return res
 
     def GetRemoteSessionParameters(self, nodeId: int) -> typing.Optional[SessionParameters]:
         '''
@@ -1774,7 +1773,7 @@ def SendGroupCommand(self, groupid: int, payload: ClusterObjects.ClusterCommand,
             groupid, self.devCtrl, payload, busyWaitMs=busyWaitMs).raise_on_error()
 
         # None is the expected return for sending group commands.
-        return None
+        return
 
     async def WriteAttribute(self, nodeId: int,
                              attributes: typing.List[typing.Union[
@@ -1968,29 +1967,26 @@ def _parseAttributePathTuple(self, pathTuple: typing.Union[
         if pathTuple == ('*') or pathTuple == ():
             # Wildcard
             return ClusterAttribute.AttributePath()
-        elif not isinstance(pathTuple, tuple):
+        if not isinstance(pathTuple, tuple):
             if isinstance(pathTuple, int):
                 return ClusterAttribute.AttributePath(EndpointId=pathTuple)
-            elif issubclass(pathTuple, ClusterObjects.Cluster):  # type: ignore[misc, arg-type]
+            if issubclass(pathTuple, ClusterObjects.Cluster):  # type: ignore[misc, arg-type]
                 return ClusterAttribute.AttributePath.from_cluster(EndpointId=None, Cluster=pathTuple)  # type: ignore[arg-type]
-            elif issubclass(pathTuple, ClusterObjects.ClusterAttributeDescriptor):  # type: ignore[arg-type]
+            if issubclass(pathTuple, ClusterObjects.ClusterAttributeDescriptor):  # type: ignore[arg-type]
                 return ClusterAttribute.AttributePath.from_attribute(EndpointId=None, Attribute=pathTuple)  # type: ignore[arg-type]
-            else:
-                raise ValueError("Unsupported Attribute Path")
-        else:
-            # endpoint + (cluster) attribute / endpoint + cluster
-            if issubclass(pathTuple[1], ClusterObjects.Cluster):  # type: ignore[misc]
-                return ClusterAttribute.AttributePath.from_cluster(
-                    EndpointId=pathTuple[0],  # type: ignore[arg-type]
-                    Cluster=pathTuple[1]  # type: ignore[arg-type, misc]
-                )
-            elif issubclass(pathTuple[1], ClusterAttribute.ClusterAttributeDescriptor):  # type: ignore[arg-type, misc]
-                return ClusterAttribute.AttributePath.from_attribute(
-                    EndpointId=pathTuple[0],    # type: ignore[arg-type]
-                    Attribute=pathTuple[1]  # type: ignore[arg-type, misc]
-                )
-            else:
-                raise ValueError("Unsupported Attribute Path")
+            raise ValueError("Unsupported Attribute Path")
+        # endpoint + (cluster) attribute / endpoint + cluster
+        if issubclass(pathTuple[1], ClusterObjects.Cluster):  # type: ignore[misc]
+            return ClusterAttribute.AttributePath.from_cluster(
+                EndpointId=pathTuple[0],  # type: ignore[arg-type]
+                Cluster=pathTuple[1]  # type: ignore[arg-type, misc]
+            )
+        if issubclass(pathTuple[1], ClusterAttribute.ClusterAttributeDescriptor):  # type: ignore[arg-type, misc]
+            return ClusterAttribute.AttributePath.from_attribute(
+                EndpointId=pathTuple[0],    # type: ignore[arg-type]
+                Attribute=pathTuple[1]  # type: ignore[arg-type, misc]
+            )
+        raise ValueError("Unsupported Attribute Path")
 
     def _parseDataVersionFilterTuple(self, pathTuple: typing.List[typing.Tuple[int, typing.Type[ClusterObjects.Cluster], int]]):
         endpoint = None
@@ -2027,40 +2023,36 @@ def _parseEventPathTuple(self, pathTuple: typing.Union[
         if pathTuple in [('*'), ()]:
             # Wildcard
             return ClusterAttribute.EventPath()
-        elif not isinstance(pathTuple, tuple):
+        if not isinstance(pathTuple, tuple):
             # mypy refactor (PR https://github.com/project-chip/connectedhomeip/pull/39827):
             # instantiate class types before passing to from_cluster/from_event
             # because these expect instances, not classes.
             if isinstance(pathTuple, int):
                 return ClusterAttribute.EventPath(EndpointId=pathTuple)
-            elif isinstance(pathTuple, type) and issubclass(pathTuple, ClusterObjects.Cluster):
+            if isinstance(pathTuple, type) and issubclass(pathTuple, ClusterObjects.Cluster):
                 return ClusterAttribute.EventPath.from_cluster(EndpointId=None, Cluster=pathTuple)
-            elif isinstance(pathTuple, type) and issubclass(pathTuple, ClusterObjects.ClusterEvent):
+            if isinstance(pathTuple, type) and issubclass(pathTuple, ClusterObjects.ClusterEvent):
                 return ClusterAttribute.EventPath.from_event(EndpointId=None, Event=pathTuple)
-            else:
-                raise ValueError("Unsupported Event Path")
-        else:
-            if pathTuple[0] == '*':
-                return ClusterAttribute.EventPath(Urgent=pathTuple[-1])
-            else:
-                urgent = bool(pathTuple[-1]) if len(pathTuple) > 2 else False
-                # endpoint + (cluster) event / endpoint + cluster
-                # mypy errors ignored due to valid use of dynamic types (e.g., int, str, or class types).
-                # Fixing these typing errors is a high risk to affect existing functionality.
-                # These mismatches are intentional and safe within the current logic.
-                if issubclass(pathTuple[1], ClusterObjects.Cluster):  # type: ignore[arg-type]
-                    return ClusterAttribute.EventPath.from_cluster(
-                        EndpointId=pathTuple[0],    # type: ignore[arg-type]
-                        Cluster=pathTuple[1], Urgent=urgent  # type: ignore[arg-type]
-                    )
-                elif issubclass(pathTuple[1], ClusterAttribute.ClusterEvent):  # type: ignore[arg-type]
-                    return ClusterAttribute.EventPath.from_event(
-                        EndpointId=pathTuple[0],    # type: ignore[arg-type]
-                        Event=pathTuple[1],  # type: ignore[arg-type]
-                        Urgent=urgent
-                    )
-                else:
-                    raise ValueError("Unsupported Attribute Path")
+            raise ValueError("Unsupported Event Path")
+        if pathTuple[0] == '*':
+            return ClusterAttribute.EventPath(Urgent=pathTuple[-1])
+        urgent = bool(pathTuple[-1]) if len(pathTuple) > 2 else False
+        # endpoint + (cluster) event / endpoint + cluster
+        # mypy errors ignored due to valid use of dynamic types (e.g., int, str, or class types).
+        # Fixing these typing errors is a high risk to affect existing functionality.
+        # These mismatches are intentional and safe within the current logic.
+        if issubclass(pathTuple[1], ClusterObjects.Cluster):  # type: ignore[arg-type]
+            return ClusterAttribute.EventPath.from_cluster(
+                EndpointId=pathTuple[0],    # type: ignore[arg-type]
+                Cluster=pathTuple[1], Urgent=urgent  # type: ignore[arg-type]
+            )
+        if issubclass(pathTuple[1], ClusterAttribute.ClusterEvent):  # type: ignore[arg-type]
+            return ClusterAttribute.EventPath.from_event(
+                EndpointId=pathTuple[0],    # type: ignore[arg-type]
+                Event=pathTuple[1],  # type: ignore[arg-type]
+                Urgent=urgent
+            )
+        raise ValueError("Unsupported Attribute Path")
 
     async def Read(
         self,
@@ -2275,8 +2267,7 @@ async def ReadAttribute(
                               payloadCapability=payloadCapability)
         if isinstance(res, ClusterAttribute.SubscriptionTransaction):
             return res
-        else:
-            return res.attributes
+        return res.attributes
 
     async def ReadEvent(
         self,
@@ -2349,8 +2340,7 @@ async def ReadEvent(
                               autoResubscribe=autoResubscribe, payloadCapability=payloadCapability)
         if isinstance(res, ClusterAttribute.SubscriptionTransaction):
             return res
-        else:
-            return res.events
+        return res.events
 
     def SetIpk(self, ipk: bytes):
         '''

src/controller/python/matter/clusters/Attribute.py

@@ -464,8 +464,7 @@ def GetAttribute(self, path: TypedAttributePath) -> Any:
 
         if (self._readTransaction._cache.returnClusterObject):
             return eval(f'data[path.Path.EndpointId][path.ClusterType].{path.AttributeName}')
-        else:
-            return data[path.Path.EndpointId][path.ClusterType][path.AttributeType]
+        return data[path.Path.EndpointId][path.ClusterType][path.AttributeType]
 
     def GetEvents(self):
         return self._readTransaction.GetAllEventValues()

src/controller/python/matter/commissioning/commissioning_flow_blocks.py

@@ -209,7 +209,7 @@ async def network_commissioning(self, parameter: commissioning.Parameters, node_
         if Clusters.NetworkCommissioning.id not in clusters[commissioning.ROOT_ENDPOINT_ID][Clusters.Descriptor].serverList:
             self._logger.info(
                 f"Network commissioning cluster {commissioning.ROOT_ENDPOINT_ID} is not enabled on this device.")
-            return
+            return None
 
         network_commissioning_cluster_state = (await self._devCtrl.ReadAttribute(
             nodeId=node_id,
@@ -220,16 +220,17 @@ async def network_commissioning(self, parameter: commissioning.Parameters, node_
                 if networks.connected:
                     self._logger.info(
                         f"Device already connected to {networks.networkID.hex()} skip network commissioning")
-                    return
+                    return None
 
         if parameter.commissionee_info.is_wifi_device:
             if network_commissioning_cluster_state.featureMap != commissioning.NetworkCommissioningFeatureMap.WIFI_NETWORK_FEATURE_MAP:
                 raise AssertionError("Device is expected to be a WiFi device")
             return await self.network_commissioning_wifi(parameter=parameter, node_id=node_id)
-        elif parameter.commissionee_info.is_thread_device:
+        if parameter.commissionee_info.is_thread_device:
             if network_commissioning_cluster_state.featureMap != commissioning.NetworkCommissioningFeatureMap.THREAD_NETWORK_FEATURE_MAP:
                 raise AssertionError("Device is expected to be a Thread device")
             return await self.network_commissioning_thread(parameter=parameter, node_id=node_id)
+        return None
 
     async def send_regulatory_config(self, parameter: commissioning.Parameters, node_id: int):
         self._logger.info("Sending Regulatory Config")

src/controller/python/matter/interaction_model/__init__.py

@@ -100,8 +100,7 @@ def __init__(self, status: Status, clusterStatus: int = kUndefinedClusterStatus)
     def __str__(self):
         if self.hasClusterStatus:
             return f"InteractionModelError: {self._status.name} (0x{self._status.value:x}, clusterStatus: {self._clusterStatus})"
-        else:
-            return f"InteractionModelError: {self._status.name} (0x{self._status.value:x})"
+        return f"InteractionModelError: {self._status.name} (0x{self._status.value:x})"
 
     @property
     def hasClusterStatus(self) -> bool:

src/controller/python/matter/tlv/__init__.py

@@ -403,25 +403,21 @@ def _encodeControlAndTag(self, type, tag, lenOfLenOrVal=0):
                 if tagNum <= UINT16_MAX:
                     controlByte |= TLV_TAG_CONTROL_IMPLICIT_PROFILE_2Bytes
                     return struct.pack("<BH", controlByte, tagNum)
-                else:
-                    controlByte |= TLV_TAG_CONTROL_IMPLICIT_PROFILE_4Bytes
-                    return struct.pack("<BL", controlByte, tagNum)
-            elif profile == 0:
+                controlByte |= TLV_TAG_CONTROL_IMPLICIT_PROFILE_4Bytes
+                return struct.pack("<BL", controlByte, tagNum)
+            if profile == 0:
                 if tagNum <= UINT16_MAX:
                     controlByte |= TLV_TAG_CONTROL_COMMON_PROFILE_2Bytes
                     return struct.pack("<BH", controlByte, tagNum)
-                else:
-                    controlByte |= TLV_TAG_CONTROL_COMMON_PROFILE_4Bytes
-                    return struct.pack("<BL", controlByte, tagNum)
-            else:
-                vendorId = (profile >> 16) & 0xFFFF
-                profileNum = (profile >> 0) & 0xFFFF
-                if tagNum <= UINT16_MAX:
-                    controlByte |= TLV_TAG_CONTROL_FULLY_QUALIFIED_6Bytes
-                    return struct.pack("<BHHH", controlByte, vendorId, profileNum, tagNum)
-                else:
-                    controlByte |= TLV_TAG_CONTROL_FULLY_QUALIFIED_8Bytes
-                    return struct.pack("<BHHL", controlByte, vendorId, profileNum, profile, tagNum)
+                controlByte |= TLV_TAG_CONTROL_COMMON_PROFILE_4Bytes
+                return struct.pack("<BL", controlByte, tagNum)
+            vendorId = (profile >> 16) & 0xFFFF
+            profileNum = (profile >> 0) & 0xFFFF
+            if tagNum <= UINT16_MAX:
+                controlByte |= TLV_TAG_CONTROL_FULLY_QUALIFIED_6Bytes
+                return struct.pack("<BHHH", controlByte, vendorId, profileNum, tagNum)
+            controlByte |= TLV_TAG_CONTROL_FULLY_QUALIFIED_8Bytes
+            return struct.pack("<BHHL", controlByte, vendorId, profileNum, profile, tagNum)
         raise ValueError("Invalid object given for TLV tag")
 
     @staticmethod

src/controller/python/matter/tlv/tlvlist.py

@@ -87,14 +87,12 @@ def as_tuple(self):
         def as_rich_repr_tuple(self):
             if self.tag is None:
                 return "Anonymous", repr(self.value)
-            else:
-                return str(self.tag), repr(self.value)
+            return str(self.tag), repr(self.value)
 
         def __repr__(self):
             if self.tag is None:
                 return "Anonymous: " + repr(self.value)
-            else:
-                return str(self.tag) + ": " + repr(self.value)
+            return str(self.tag) + ": " + repr(self.value)
 
         def __rich_repr__(self):
             yield self.as_rich_repr_tuple()
@@ -146,10 +144,10 @@ def __getitem__(self, access) -> Any:
             tag, index = access.start, access.stop
             if tag == TLVList.IndexMethod.Tag:
                 return self._get_item_by_tag(index)
-            elif tag == TLVList.IndexMethod.Index:
+            if tag == TLVList.IndexMethod.Index:
                 return self._data[index].as_tuple()
             raise ValueError("Method should be TLVList.IndexMethod.Tag or TLVList.IndexMethod.Index")
-        elif isinstance(access, int):
+        if isinstance(access, int):
             return self._get_item_by_tag(access)
         raise ValueError("Invalid access method")
 

src/controller/python/matter/webrtc/browser_peer_connection.py

@@ -255,7 +255,7 @@ async def check_for_session_establishment(self) -> bool:
                 PeerConnectionState.INVALID,
             ]:
                 return False
-            elif self._peer_state == PeerConnectionState.CONNECTED:
+            if self._peer_state == PeerConnectionState.CONNECTED:
                 return True
             self._peer_state = await event_queue.get(timeout=30)
 

src/controller/python/matter/webrtc/browser_webrtc_client.py

@@ -72,8 +72,7 @@ async def get_local_description(self):
 
     async def get_peer_connection_state(self):
         event = "GET_PEER_CONNECTION_STATE"
-        state = await self.send_message(event)
-        return state
+        return await self.send_message(event)
 
     def on_gathering_complete(self, callback):
         self.event_callbacks["GATHERING_STATE_COMPLETE"] = callback