[nrf fromtree] scripts: Non-safely fix python files

Uses ruff with --unsafe-fixes to fix python files in this folder
This is a separate commit so it can be reverted if it causes
problems

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 497688bafff2c3e183a016b68fc51f1bedf488c9)

Author: nordicjm

scripts/assemble.py

@@ -31,13 +31,10 @@
 
 def same_keys(a, b):
     """Determine if the dicts a and b have the same keys in them"""
-    for ak in a.keys():
+    for ak in a:
         if ak not in b:
             return False
-    for bk in b.keys():
-        if bk not in a:
-            return False
-    return True
+    return all(bk in a for bk in b)
 
 offset_re = re.compile(r"^#define DT_FLASH_AREA_([0-9A-Z_]+)_OFFSET(_0)?\s+(0x[0-9a-fA-F]+|[0-9]+)$")
 size_re   = re.compile(r"^#define DT_FLASH_AREA_([0-9A-Z_]+)_SIZE(_0)?\s+(0x[0-9a-fA-F]+|[0-9]+)$")
@@ -130,7 +127,7 @@ def main():
     sys.path.insert(0, os.path.join(zephyr_base, "scripts", "dts", "python-devicetree", "src"))
     import devicetree.edtlib
 
-    board = find_board_name(args.bootdir)
+    find_board_name(args.bootdir)
 
     edt_pickle = os.path.join(args.bootdir, "zephyr", "edt.pickle")
     with open(edt_pickle, 'rb') as f:

scripts/imgtool/dumpinfo.py

@@ -262,7 +262,7 @@ def dump_imginfo(imgfile, outfile=None, silent=False):
                 flag_string = hex(value)
             else:
                 flag_string = ""
-                for flag in image.IMAGE_F.keys():
+                for flag in image.IMAGE_F:
                     if value & image.IMAGE_F[flag]:
                         if flag_string:
                             flag_string += ("\n" + (" " * 20))

scripts/imgtool/image.py

@@ -598,11 +598,10 @@ def create(self, key, public_key_format, enckey, dependencies=None,
                     self.payload.extend(pad)
 
         compression_flags = 0x0
-        if compression_tlvs is not None:
-            if compression_type in ["lzma2", "lzma2armthumb"]:
-                compression_flags = IMAGE_F['COMPRESSED_LZMA2']
-                if compression_type == "lzma2armthumb":
-                    compression_flags |= IMAGE_F['COMPRESSED_ARM_THUMB']
+        if compression_tlvs is not None and compression_type in ["lzma2", "lzma2armthumb"]:
+            compression_flags = IMAGE_F['COMPRESSED_LZMA2']
+            if compression_type == "lzma2armthumb":
+                compression_flags |= IMAGE_F['COMPRESSED_ARM_THUMB']
         # This adds the header to the payload as well
         if encrypt_keylen == 256:
             self.add_header(enckey, protected_tlv_size, compression_flags, 256)

scripts/imgtool/keys/general.py

@@ -17,7 +17,7 @@ def __init__(self, file, *args, **kwargs):
         self.kwargs = kwargs
 
     def __enter__(self):
-        if isinstance(self.file_in, (str, bytes, os.PathLike)):
+        if isinstance(self.file_in, str | bytes | os.PathLike):
             self.file = open(self.file_in, *self.args, **self.kwargs)
         else:
             self.file = self.file_in

scripts/imgtool/main.py

@@ -43,8 +43,7 @@
 
 MIN_PYTHON_VERSION = (3, 6)
 if sys.version_info < MIN_PYTHON_VERSION:
-    sys.exit("Python %s.%s or newer is required by imgtool."
-             % MIN_PYTHON_VERSION)
+    sys.exit("Python {}.{} or newer is required by imgtool.".format(*MIN_PYTHON_VERSION))
 
 SlottedSemiSemVersion = namedtuple('SemiSemVersion', ['major', 'minor', 'revision',
                                                'build', 'slot'])
@@ -358,9 +357,8 @@ def convert(self, value, param, ctx):
         try:
             return int(value, 0)
         except ValueError:
-            self.fail('%s is not a valid integer. Please use code literals '
-                      'prefixed with 0b/0B, 0o/0O, or 0x/0X as necessary.'
-                      % value, param, ctx)
+            self.fail(f'{value} is not a valid integer. Please use code literals '
+                      'prefixed with 0b/0B, 0o/0O, or 0x/0X as necessary.', param, ctx)
 
 
 @click.argument('outfile')
@@ -501,16 +499,15 @@ def sign(key, public_key_format, align, version, pad_sig, header_size,
     img.load(infile)
     key = load_key(key) if key else None
     enckey = load_key(encrypt) if encrypt else None
-    if enckey and key:
-        if ((isinstance(key, keys.ECDSA256P1) and
-             not isinstance(enckey, keys.ECDSA256P1Public))
-           or (isinstance(key, keys.ECDSA384P1) and
-               not isinstance(enckey, keys.ECDSA384P1Public))
-                or (isinstance(key, keys.RSA) and
-                    not isinstance(enckey, keys.RSAPublic))):
-            # FIXME
-            raise click.UsageError("Signing and encryption must use the same "
-                                   "type of key")
+    if enckey and key and ((isinstance(key, keys.ECDSA256P1) and
+         not isinstance(enckey, keys.ECDSA256P1Public))
+       or (isinstance(key, keys.ECDSA384P1) and
+           not isinstance(enckey, keys.ECDSA384P1Public))
+            or (isinstance(key, keys.RSA) and
+                not isinstance(enckey, keys.RSAPublic))):
+        # FIXME
+        raise click.UsageError("Signing and encryption must use the same "
+                               "type of key")
 
     if pad_sig and hasattr(key, 'pad_sig'):
         key.pad_sig = True
@@ -520,10 +517,10 @@ def sign(key, public_key_format, align, version, pad_sig, header_size,
     for tlv in custom_tlv:
         tag = int(tlv[0], 0)
         if tag in custom_tlvs:
-            raise click.UsageError('Custom TLV %s already exists.' % hex(tag))
+            raise click.UsageError(f'Custom TLV {hex(tag)} already exists.')
         if tag in image.TLV_VALUES.values():
             raise click.UsageError(
-                'Custom TLV %s conflicts with predefined TLV.' % hex(tag))
+                f'Custom TLV {hex(tag)} conflicts with predefined TLV.')
 
         value = tlv[1]
         if value.startswith('0x'):