Complete pyupgrade implementation: fix all UP031 and line length issues

Co-authored-by: dobairoland <[email protected]>

Author: Copilot

espefuse/efuse/base_fields.py

@@ -264,7 +264,9 @@ def print_block(self, bit_string, comment, debug=False):
         if self.parent.debug or debug:
             bit_string.pos = 0
             log.print(
-                "{:<15s} ({:<16s}) [{:>2d}] {}:".format(self.name, " ".join(self.alias)[:16], self.id, comment),
+                "{:<15s} ({:<16s}) [{:>2d}] {}:".format(
+                    self.name, " ".join(self.alias)[:16], self.id, comment
+                ),
                 " ".join(
                     [
                         "{:08x}".format(word)
@@ -284,7 +286,9 @@ def check_wr_data(self):
             return False
         if len(wr_data.bytes) != len(self.bitarray.bytes):
             raise esptool.FatalError(
-                "Data does not fit: the block{} size is {} bytes, data is {} bytes".format(self.id, len(self.bitarray.bytes), len(wr_data.bytes))
+                "Data does not fit: block{} size {} bytes, data {} bytes".format(
+                    self.id, len(self.bitarray.bytes), len(wr_data.bytes)
+                )
             )
         self.check_wr_rd_protect()
 
@@ -672,7 +676,9 @@ def burn_block(block, postponed_efuses):
     @staticmethod
     def confirm(action, do_not_confirm):
         log.print(
-            "{}{}\nThis is an irreversible operation!".format(action, "" if action.endswith("\n") else ". ")
+            "{}{}\nThis is an irreversible operation!".format(
+                action, "" if action.endswith("\n") else ". "
+            )
         )
         if not do_not_confirm:
             log.print("Type 'BURN' (all capitals) to continue.", flush=True)

espefuse/efuse/base_operations.py

@@ -991,7 +991,9 @@ def read_protect_efuse(self, efuse_names: list[str]):
                     ]
                     if error:
                         raise esptool.FatalError(
-                            "{} must be readable, stop this operation!".format(efuse_name)
+                            "{} must be readable, stop this operation!".format(
+                                efuse_name
+                            )
                         )
                 else:
                     for block in self.efuses.Blocks.BLOCKS:
@@ -1001,7 +1003,9 @@ def read_protect_efuse(self, efuse_names: list[str]):
                                 self.efuses[block.key_purpose].get()
                             ):
                                 raise esptool.FatalError(
-                                    "{} must be readable, stop this operation!".format(efuse_name)
+                                    "{} must be readable, stop this operation!".format(
+                                        efuse_name
+                                    )
                                 )
                             break
                 # make full list of which efuses will be disabled
@@ -1013,7 +1017,9 @@ def read_protect_efuse(self, efuse_names: list[str]):
                 ]
                 names = ", ".join(e.name for e in all_disabling)
                 log.print(
-                    "Permanently read-disabling eFuse{} {}".format("s" if len(all_disabling) > 1 else "", names)
+                    "Permanently read-disabling eFuse{} {}".format(
+                        "s" if len(all_disabling) > 1 else "", names
+                    )
                 )
                 efuse.disable_read()
 
@@ -1054,7 +1060,9 @@ def write_protect_efuse(self, efuse_names: list[str]):
                 ]
                 names = ", ".join(e.name for e in all_disabling)
                 log.print(
-                    "Permanently write-disabling eFuse{} {}".format("s" if len(all_disabling) > 1 else "", names)
+                    "Permanently write-disabling eFuse{} {}".format(
+                        "s" if len(all_disabling) > 1 else "", names
+                    )
                 )
                 efuse.disable_write()
 
@@ -1165,7 +1173,9 @@ def burn_bit(self, block: str, bit_number: list[int]):
         data_block.reverse()
         log.print(
             "bit_number:   "
-            "[{:03d}]........................................................[0]".format(data_block.len - 1)
+            "[{:03d}]........................................................[0]".format(
+                data_block.len - 1
+            )
         )
         log.print("BLOCK{:>2d}   :".format(block_obj.id), data_block)
         block_obj.print_block(data_block, "regs_to_write", debug=True)

espefuse/efuse/csv_table_parser.py

@@ -266,6 +266,4 @@ def __init__(self, e):
 
 class ValidationError(InputError):
     def __init__(self, p, message):
-        super().__init__(
-            f"Entry {p.field_name} invalid: {message}"
-        )
+        super().__init__(f"Entry {p.field_name} invalid: {message}")

espefuse/efuse/esp32/fields.py

@@ -82,7 +82,9 @@ def __init__(
         self.BLOCKS_FOR_KEYS = self.Blocks.get_blocks_for_keys()
         if esp.CHIP_NAME != "ESP32":
             raise esptool.FatalError(
-                "Expected the 'esp' param for ESP32 chip but got for '{}'.".format(esp.CHIP_NAME)
+                "Expected the 'esp' param for ESP32 chip but got for '{}'.".format(
+                    esp.CHIP_NAME
+                )
             )
         self.blocks = [
             EfuseBlock(self, self.Blocks.get(block), skip_read=skip_connect)
@@ -114,7 +116,9 @@ def __init__(
                 ]
             else:
                 raise esptool.FatalError(
-                    "The coding scheme ({}) - is not supported".format(self.coding_scheme)
+                    "The coding scheme ({}) - is not supported".format(
+                        self.coding_scheme
+                    )
                 )
             if self["MAC_VERSION"].get() == 1:
                 self.efuses += [

espefuse/efuse/esp32/operations.py

@@ -295,7 +295,9 @@ def burn_key_digest(
         if chip_revision < 300:
             raise esptool.FatalError(
                 "Incorrect chip revision for Secure boot v2. "
-                "Detected: v{}.{}. Expected: >= v3.0".format(chip_revision // 100, chip_revision % 100)
+                "Detected: v{}.{}. Expected: >= v3.0".format(
+                    chip_revision // 100, chip_revision % 100
+                )
             )
 
         digest = espsecure._digest_sbv2_public_key(keyfile)

espefuse/efuse/esp32c2/fields.py

@@ -72,7 +72,9 @@ def __init__(
         self.BLOCKS_FOR_KEYS = self.Blocks.get_blocks_for_keys()
         if esp.CHIP_NAME != "ESP32-C2":
             raise esptool.FatalError(
-                "Expected the 'esp' param for ESP32-C2 chip but got for '{}'.".format(esp.CHIP_NAME)
+                "Expected the 'esp' param for ESP32-C2 chip but got for '{}'.".format(
+                    esp.CHIP_NAME
+                )
             )
         if not skip_connect:
             flags = self._esp.get_security_info()["flags"]
@@ -224,7 +226,9 @@ def set_efuse_timing(self):
         xtal_freq = self.get_crystal_freq()
         if xtal_freq not in [26, 40]:
             raise esptool.FatalError(
-                "The eFuse supports only xtal=26M and 40M (xtal was {})".format(xtal_freq)
+                "The eFuse supports only xtal=26M and 40M (xtal was {})".format(
+                    xtal_freq
+                )
             )
 
         self.update_reg(self.REGS.EFUSE_DAC_CONF_REG, self.REGS.EFUSE_DAC_NUM_M, 0xFF)

espefuse/efuse/esp32c2/operations.py

@@ -153,7 +153,9 @@ def burn_key(
         ):
             raise esptool.FatalError(
                 "The number of blocks ({}), datafile ({}) and "
-                "keypurpose ({}) should be the same.".format(len(block_name_list), len(datafile_list), len(keypurpose_list))
+                "keypurpose ({}) should be the same.".format(
+                    len(block_name_list), len(datafile_list), len(keypurpose_list)
+                )
             )
 
         assert 1 <= len(block_name_list) <= 2, "Unexpected case"
@@ -277,7 +279,9 @@ def burn_key_digest(
         if len(digest) != num_bytes:
             raise esptool.FatalError(
                 "Incorrect digest size {}. "
-                "Digest must be {} bytes ({} bits) of raw binary key data.".format(len(digest), num_bytes, num_bytes * 8)
+                "Digest must be {} bytes ({} bits) of raw binary key data.".format(
+                    len(digest), num_bytes, num_bytes * 8
+                )
             )
         self.burn_key(
             ["BLOCK_KEY0"],

espefuse/efuse/esp32c3/fields.py

@@ -72,7 +72,9 @@ def __init__(
         self.BLOCKS_FOR_KEYS = self.Blocks.get_blocks_for_keys()
         if esp.CHIP_NAME != "ESP32-C3":
             raise esptool.FatalError(
-                "Expected the 'esp' param for ESP32-C3 chip but got for '{}'.".format(esp.CHIP_NAME)
+                "Expected the 'esp' param for ESP32-C3 chip but got for '{}'.".format(
+                    esp.CHIP_NAME
+                )
             )
         if not skip_connect:
             flags = self._esp.get_security_info()["flags"]

espefuse/efuse/esp32c3/operations.py

@@ -294,7 +294,9 @@ def burn_key_digest(
             if len(digest) != num_bytes:
                 raise esptool.FatalError(
                     "Incorrect digest size {}. Digest must be {} bytes ({} bits) "
-                    "of raw binary key data.".format(len(digest), num_bytes, num_bytes * 8)
+                    "of raw binary key data.".format(
+                        len(digest), num_bytes, num_bytes * 8
+                    )
                 )
             digest_list.append(digest)
 

espefuse/efuse/esp32c5/fields.py

@@ -72,7 +72,9 @@ def __init__(
         self.BLOCKS_FOR_KEYS = self.Blocks.get_blocks_for_keys()
         if esp.CHIP_NAME != "ESP32-C5":
             raise esptool.FatalError(
-                "Expected the 'esp' param for ESP32-C5 chip but got for '{}'.".format(esp.CHIP_NAME)
+                "Expected the 'esp' param for ESP32-C5 chip but got for '{}'.".format(
+                    esp.CHIP_NAME
+                )
             )
         if not skip_connect:
             flags = self._esp.get_security_info()["flags"]
@@ -232,7 +234,7 @@ def set_efuse_timing(self):
         apb_freq = self.get_crystal_freq()
         if apb_freq not in [40, 48]:
             raise esptool.FatalError(
-                "The eFuse supports only xtal=40M and 48M (xtal was %d)" % apb_freq
+                "The eFuse supports only xtal=40M and 48M (xtal was {}".format(apb_freq)
             )
 
         self.update_reg(self.REGS.EFUSE_DAC_CONF_REG, self.REGS.EFUSE_DAC_NUM_M, 0xFF)
@@ -259,7 +261,7 @@ def get_coding_scheme_warnings(self, silent=False):
                 ]
                 block.err_bitarray.pos = 0
                 for word in reversed(words):
-                    block.err_bitarray.overwrite(BitArray("uint:32=%d" % word))
+                    block.err_bitarray.overwrite(BitArray("uint:32={}".format(word)))
                 block.num_errors = block.err_bitarray.count(True)
                 block.fail = block.num_errors != 0
             else:
@@ -276,8 +278,9 @@ def get_coding_scheme_warnings(self, silent=False):
             ret_fail |= block.fail
             if not silent and (block.fail or block.num_errors):
                 log.print(
-                    "Error(s) in BLOCK%d [ERRORS:%d FAIL:%d]"
-                    % (block.id, block.num_errors, block.fail)
+                    "Error(s) in BLOCK{} [ERRORS:{} FAIL:{}]".format(
+                        block.id, block.num_errors, block.fail
+                    )
                 )
         if (self.debug or ret_fail) and not silent:
             self.print_status_regs()