Enforce return code style check in Python code (project-chip#41842)

* Post merge review updates

* Add ruff rule to check for return value correctness

* Apply ruff automatic fixes

* Apply ruff rewrite fixes

* Cleanup dead code

* Apply restyle fixes

* Simplify if else logic by inlining return

Author: arkq

config/esp32/components/chip/create_args_gn.py

@@ -45,8 +45,7 @@
 
     def get_compile_flags(src_file):
         compile_command = [
-            res["command"]
-            for res in filter(lambda cmd: cmd["file"] == src_file, compile_commands)
+            res["command"] for res in compile_commands if res["file"] == src_file
         ]
 
         if len(compile_command) != 1:

credentials/fetch_paa_certs_from_dcl.py

@@ -73,14 +73,13 @@ def parse_paa_root_certs(cmdpipe, paa_list):
         line = cmdpipe.stdout.readline()
         if not line:
             break
-        else:
-            if b': ' in line:
-                key, value = line.split(b': ')
-                result[key.strip(b' -').decode("utf-8")
-                       ] = value.strip().decode("utf-8")
-                parse_paa_root_certs.counter += 1
-                if parse_paa_root_certs.counter % 2 == 0:
-                    paa_list.append(copy.deepcopy(result))
+        if b': ' in line:
+            key, value = line.split(b': ')
+            result[key.strip(b' -').decode("utf-8")
+                   ] = value.strip().decode("utf-8")
+            parse_paa_root_certs.counter += 1
+            if parse_paa_root_certs.counter % 2 == 0:
+                paa_list.append(copy.deepcopy(result))
 
 
 def write_cert(certificate, subject):
@@ -109,16 +108,15 @@ def parse_paa_root_cert_from_dcld(cmdpipe):
         line = cmdpipe.stdout.readline()
         if not line:
             break
-        else:
-            if b'pemCert: |' in line:
-                while True:
-                    line = cmdpipe.stdout.readline()
-                    certificate += line.strip(b' \t').decode("utf-8")
-                    if b'-----END CERTIFICATE-----' in line:
-                        break
-            if b'subjectAsText:' in line:
-                subject = line.split(b': ')[1].strip().decode("utf-8")
-                break
+        if b'pemCert: |' in line:
+            while True:
+                line = cmdpipe.stdout.readline()
+                certificate += line.strip(b' \t').decode("utf-8")
+                if b'-----END CERTIFICATE-----' in line:
+                    break
+        if b'subjectAsText:' in line:
+            subject = line.split(b': ')[1].strip().decode("utf-8")
+            break
 
     return (certificate, subject)
 

credentials/generate_revocation_set.py

@@ -178,9 +178,8 @@ def is_self_signed_certificate(cert: x509.Certificate) -> bool:
     result = verify_cert(cert, cert)
     if result == CertVerificationResult.SUCCESS:
         return True
-    else:
-        logging.debug(
-            f"Certificate with subject: {cert.subject.rfc4514_string()} is not a valid self-signed certificate. Result: {result.name}")
+    logging.debug(
+        f"Certificate with subject: {cert.subject.rfc4514_string()} is not a valid self-signed certificate. Result: {result.name}")
     return False
 
 
@@ -207,13 +206,12 @@ def validate_cert_chain(crl_signer: x509.Certificate, crl_signer_delegator: x509
                 f"Cannot verify certificate subject: {crl_signer_delegator.subject.rfc4514_string()} issued by certificate subject: {paa.subject.rfc4514_string()}. Result: {result_delegator.name}")
             return False
         return True
-    else:
-        result = verify_cert(crl_signer, paa)
-        if not result == CertVerificationResult.SUCCESS:
-            logging.debug(
-                f"Cannot verify certificate subject: {crl_signer.subject.rfc4514_string()} issued by certificate subject: {paa.subject.rfc4514_string()}. Result: {result.name}")
-            return False
-        return True
+    result = verify_cert(crl_signer, paa)
+    if not result == CertVerificationResult.SUCCESS:
+        logging.debug(
+            f"Cannot verify certificate subject: {crl_signer.subject.rfc4514_string()} issued by certificate subject: {paa.subject.rfc4514_string()}. Result: {result.name}")
+        return False
+    return True
 
 
 def validate_vid_pid(revocation_point: RevocationPoint, crl_signer_certificate: x509.Certificate, crl_signer_delegator_certificate: x509.Certificate) -> bool:
@@ -371,8 +369,7 @@ def send_get_request(self, url: str) -> dict:
         Send a GET request for a json object.
         '''
         try:
-            response = requests.get(url).json()
-            return response
+            return requests.get(url).json()
         except Exception as e:
             logging.error(f"Failed to fetch {url}: {e}")
             return None
@@ -430,7 +427,7 @@ def get_paa_cert(self, initial_cert: x509.Certificate) -> Optional[x509.Certific
             akid = get_akid(initial_cert)
         except ExtensionNotFound:
             logging.warning('Certificate AKID not found.')
-            return
+            return None
         paa_certificate = None
         while not paa_certificate:
             try:
@@ -441,7 +438,7 @@ def get_paa_cert(self, initial_cert: x509.Certificate) -> Optional[x509.Certific
 
             except Exception as e:
                 logging.error('Failed to get PAA certificate', e)
-                return
+                return None
             logging.debug(f"issuer_name: {issuer_certificate.subject.rfc4514_string()}")
             issuer_name = issuer_certificate.issuer
             try:

examples/chef/chef.py

@@ -120,8 +120,7 @@ def check_python_version() -> None:
 
 def load_cicd_config() -> Dict[str, Any]:
     with open(_CICD_CONFIG_FILE_NAME) as config_file:
-        config = json.loads(config_file.read())
-    return config
+        return json.loads(config_file.read())
 
 
 def flush_print(
@@ -470,7 +469,7 @@ def main() -> int:
                     archive_name = f"{label}-{device_name}"
                     if options.build_exclude and re.search(options.build_exclude, archive_name):
                         continue
-                    elif options.build_include and not re.search(options.build_include, archive_name):
+                    if options.build_include and not re.search(options.build_include, archive_name):
                         continue
                     if options.dry_run:
                         flush_print(archive_name)

examples/chef/stateful_shell.py

@@ -159,3 +159,4 @@ def run_cmd(
                     )
 
                 return output
+        return None

pyproject.toml

@@ -33,7 +33,7 @@ select = [
     # Consistent commas
     "COM",
     # Simplify the code if possible
-    "C4",
+    "C4", "RET",
     # Ensure that scripts are executable
     "EXE",
     # Check for common logging issues

scripts/build/builders/android.py

@@ -53,14 +53,10 @@ def AbiName(self):
         raise Exception("Unknown board type: %r" % self)
 
     def IsIde(self):
-        if (
-            self == AndroidBoard.AndroidStudio_ARM
-            or self == AndroidBoard.AndroidStudio_ARM64
-            or self == AndroidBoard.AndroidStudio_X64
-            or self == AndroidBoard.AndroidStudio_X86
-        ):
-            return True
-        return False
+        return (self == AndroidBoard.AndroidStudio_ARM
+                or self == AndroidBoard.AndroidStudio_ARM64
+                or self == AndroidBoard.AndroidStudio_X64
+                or self == AndroidBoard.AndroidStudio_X86)
 
 
 class AndroidApp(Enum):

scripts/py_matter_idl/matter/idl/data_model_xml/handlers/handlers.py

@@ -468,7 +468,7 @@ def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl):
             is_command = False  # response
         else:
             log.warning("Could not clearly determine command direction: %s",
-                        list(attrs.items()))
+                        attrs.items())
             # Do a best-guess. However we should NOT need to guess once
             # we have a good data set
             is_command = not attrs["name"].endswith("Response")

scripts/py_matter_idl/matter/idl/data_model_xml/handlers/parsing.py

@@ -268,7 +268,7 @@ def AttributesToEvent(attrs: AttributesImpl) -> Event:
         elif attrs["priority"] == "debug":
             priority = EventPriority.DEBUG
         elif attrs["priority"] == "desc":
-            log.warning("Found an event with 'desc' priority: '%s'", list(attrs.items()))
+            log.warning("Found an event with 'desc' priority: '%s'", attrs.items())
             priority = EventPriority.CRITICAL
         else:
             raise Exception("UNKNOWN event priority: %r" % attrs["priority"])

scripts/py_matter_idl/matter/idl/generators/cpp/tlvmeta/__init__.py

@@ -171,7 +171,7 @@ def GenerateTables(self) -> Generator[Table, None, None]:
             )
             for e in self.cluster.events if e.fields
         ])
-        cluster_entries.extend(list(self.CommandEntries()))
+        cluster_entries.extend(self.CommandEntries())
 
         yield Table(
             full_name=self.cluster.name,
@@ -239,7 +239,7 @@ def GenerateTables(self) -> Generator[Table, None, None]:
 def CreateTables(idl: Idl) -> List[Table]:
     result = []
     for cluster in idl.clusters:
-        result.extend(list(ClusterTablesGenerator(cluster).GenerateTables()))
+        result.extend(ClusterTablesGenerator(cluster).GenerateTables())
     return result