[Python] Enforce code simplification if possible - some SIM rules (project-chip#42187)

* Enforce Python code simplification if possible (SIM)

* Apply fixes for SIM118

* Apply fixes for SIM101

* Apply fixes for SIM103

* Apply fixes for SIM105

* Apply fixes for SIM109

* Restyle

* Fold long lines

* Restyled by autopep8

---------

Co-authored-by: Restyled.io <[email protected]>

Author: arkq

build/gn_run_binary.py

@@ -29,6 +29,7 @@
     available.
   - Add support for .matter files.
 """
+import contextlib
 import copy
 import json
 import os
@@ -101,15 +102,11 @@ def _read_value(input_string: str) -> str:
     elif "0x" in input_string:
         ret_val = int(input_string, 16)
     elif "." in input_string:
-        try:
+        with contextlib.suppress(ValueError):
             ret_val = float(input_string)
-        except ValueError:
-            pass
     else:
-        try:
+        with contextlib.suppress(ValueError):
             ret_val = int(input_string)
-        except ValueError:
-            pass
     return str(ret_val)
 
 

examples/chef/sample_app_util/zap_file_parser.py

@@ -15,6 +15,7 @@
 #
 
 import asyncio
+import contextlib
 import os
 import string
 import sys
@@ -87,10 +88,8 @@ def __init__(self, rendezvousAddr=None, controllerNodeId=0, bluetoothAdapter=Non
             if "libedit" in readline.__doc__:
                 readline.parse_and_bind("bind ^I rl_complete")
             readline.set_completer_delims(" ")
-            try:
+            with contextlib.suppress(IOError):
                 readline.read_history_file(self.historyFileName)
-            except IOError:
-                pass
         except ImportError:
             pass
 
@@ -129,10 +128,8 @@ def postloop(self):
         try:
             import readline
 
-            try:
+            with contextlib.suppress(IOError):
                 readline.write_history_file(self.historyFileName)
-            except IOError:
-                pass
         except ImportError:
             pass
 

examples/lighting-app/python/lighting.py

@@ -34,6 +34,7 @@ select = [
     "COM",
     # Simplify the code if possible
     "C4", "RET",
+    "SIM118", "SIM101", "SIM103", "SIM105", "SIM109",
     # Ensure that scripts are executable
     "EXE",
     # Check for common logging issues
@@ -46,6 +47,7 @@ ignore = [
     "ASYNC230", # Allow open() calls in async functions
     "COM812", # Do not enforce trailing commas in multi-line collections for now
     "LOG015", # Do not enforce non-root loggers in the entire codebase for now
+    "SIM108", # Do not enforce ternary operator in place of if/else blocks
     "E501", # Do not report line length issues (formatter should handle this)
     "E721", # We use it for good reasons
 ]

pyproject.toml

@@ -751,7 +751,7 @@ def WriteProject(project):
         posixpath.join(project.build_path, "empty.cpp")))
     out.write('")\n')
 
-    for target_name in project.targets.keys():
+    for target_name in project.targets:
         out.write('\n')
         WriteTarget(out, Target(target_name, project), project)
 

scripts/examples/gn_to_cmakelists.py

@@ -329,14 +329,14 @@ def decrypt_data(data_bytearray, key_bytearray, iv_bytearray):
         mfd_str = ""
         if dict_sec.keys():
             for idx in range(1, 1 + max(dict_sec.keys())):
-                if idx in dict_sec.keys():
+                if idx in dict_sec:
                     mfd_str += dict_sec[idx] + ","
                 else:
                     mfd_str += ","
 
         mfd_str = mfd_str + ":"
         for idx in range(0x8001, 1 + max(dict_raw.keys())):
-            if idx in dict_raw.keys():
+            if idx in dict_raw:
                 mfd_str += dict_raw[idx] + ","
             else:
                 mfd_str += ","

scripts/flashing/bouffalolab_firmware_utils.py

@@ -331,7 +331,7 @@ def format_command(self, template, args=None, opt=None):
                         ↦ ρᵢ if opt[name]==σᵢ
                           ρ otherwise
         """
-        if isinstance(template, str) or isinstance(template, pathlib.Path):
+        if isinstance(template, (str, pathlib.Path)):
             result = [str(template).format_map(opt)]
         elif isinstance(template, list):
             result = []

scripts/flashing/firmware_utils.py

@@ -105,10 +105,7 @@ def Accept(self, idl: InputIdlFile):
             return False
 
         # we should not be checked for these, but verify just in case
-        if '/tests/' in idl.relative_path:
-            return False
-
-        return True
+        return '/tests/' not in idl.relative_path
 
     def CreateTarget(self, idl: InputIdlFile, runner):
         return CodegenTarget(sdk_root=self.sdk_root, idl=idl, generator="cpp-app", runner=runner)

scripts/pregenerate/using_codegen.py

@@ -86,9 +86,7 @@ def Accept(self, idl: InputIdlFile):
             return False
 
         # FIXME: implement a proper check
-        if 'test_files' in idl.relative_path:
-            return False
-        return True
+        return 'test_files' not in idl.relative_path
 
     def CreateTarget(self, idl: InputIdlFile, runner):
         # TODO: add additional arguments: tell how to invoke zap/codegen

scripts/pregenerate/using_zap.py

@@ -264,10 +264,7 @@ def JavaAttributeCallbackName(attr: Attribute, context: TypeLookupContext) -> st
 
 def IsFieldGlobalName(field: Field, context: TypeLookupContext) -> bool:
     global_name = FieldToGlobalName(field, context)
-    if global_name:
-        return True
-
-    return False
+    return bool(global_name)
 
 
 def attributesWithSupportedCallback(attrs, context: TypeLookupContext):