refactor: set up and apply pyupgrade ruff rules

Closes #1115

Closes #1116

Author: Copilot

ci/patch_dev_release.py

@@ -13,7 +13,7 @@ def patch_file(path, new_version):
     assert ".dev" in new_version
     new_version = new_version.lstrip("v")
 
-    with open(path, "r") as fin:
+    with open(path) as fin:
         lines = fin.readlines()
 
     for i, line in enumerate(lines, start=0):

docs/en/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # English Language RTD & Sphinx config file
 #

esp_rfc2217_server/__init__.py

@@ -134,7 +134,7 @@ def main():
         except KeyboardInterrupt:
             print(flush=True)
             break
-        except socket.error as msg:
+        except OSError as msg:
             logging.error(str(msg))
 
     logging.info("--- exit ---")

esp_rfc2217_server/esp_port_manager.py

@@ -38,7 +38,7 @@ class EspPortManager(serial.rfc2217.PortManager):
     def __init__(self, serial_port, connection, esp32r0_delay, logger=None):
         self.esp32r0_delay = esp32r0_delay
         self.is_download_mode = False
-        super(EspPortManager, self).__init__(serial_port, connection, logger)
+        super().__init__(serial_port, connection, logger)
 
     def _telnet_process_subnegotiation(self, suboption):
         if suboption[0:1] == COM_PORT_OPTION and suboption[1:2] == SET_CONTROL:
@@ -66,7 +66,7 @@ def _telnet_process_subnegotiation(self, suboption):
             ]:
                 return
         # only in cases not handled above do the original implementation in PortManager
-        super(EspPortManager, self)._telnet_process_subnegotiation(suboption)
+        super()._telnet_process_subnegotiation(suboption)
 
     def _hard_reset_thread(self):
         """

esp_rfc2217_server/redirector.py

@@ -5,12 +5,11 @@
 import threading
 import time
 import logging
-import socket
 
 from esp_rfc2217_server.esp_port_manager import EspPortManager
 
 
-class Redirector(object):
+class Redirector:
     def __init__(self, serial_instance, socket, debug=False, esp32r0delay=False):
         self.serial = serial_instance
         self.socket = socket
@@ -54,7 +53,7 @@ def reader(self):
                 if data:
                     # escape outgoing data when needed (Telnet IAC (0xff) character)
                     self.write(b"".join(self.rfc2217.escape(data)))
-            except socket.error as msg:
+            except OSError as msg:
                 self.log.error("{}".format(msg))
                 # probably got disconnected
                 break
@@ -74,7 +73,7 @@ def writer(self):
                 if not data:
                     break
                 self.serial.write(b"".join(self.rfc2217.filter(data)))
-            except socket.error as msg:
+            except OSError as msg:
                 self.log.error("{}".format(msg))
                 # probably got disconnected
                 break

espefuse/efuse/base_fields.py

@@ -17,7 +17,7 @@
 from . import util
 
 
-class CheckArgValue(object):
+class CheckArgValue:
     def __init__(self, efuses, name):
         self.efuses = efuses
         self.name = name
@@ -85,7 +85,7 @@ def check_arg_value(efuse, new_value):
         return check_arg_value(efuse, new_value)
 
 
-class EfuseProtectBase(object):
+class EfuseProtectBase:
     # This class is used by EfuseBlockBase and EfuseFieldBase
     read_disable_bit: int | list[int] | None
     write_disable_bit: int | list[int] | None
@@ -214,9 +214,7 @@ def get_block_len(self):
         elif coding_scheme == self.parent.REGS.CODING_SCHEME_RS:
             return self.len * 4
         else:
-            raise esptool.FatalError(
-                "Coding scheme (%d) not supported" % (coding_scheme)
-            )
+            raise esptool.FatalError(f"Coding scheme ({coding_scheme}) not supported")
 
     def get_coding_scheme(self):
         if self.id == 0:
@@ -255,7 +253,7 @@ def read(self, print_info=True):
         words = self.get_words()
         data = BitArray()
         for word in reversed(words):
-            data.append("uint:32=%d" % word)
+            data.append(f"uint:32={word}")
         self.bitarray.overwrite(data, pos=0)
         if print_info:
             self.print_block(self.bitarray, "read_regs")
@@ -264,13 +262,13 @@ def print_block(self, bit_string, comment, debug=False):
         if self.parent.debug or debug:
             bit_string.pos = 0
             log.print(
-                "%-15s (%-16s) [%-2d] %s:"
-                % (self.name, " ".join(self.alias)[:16], self.id, comment),
+                f"{self.name:<15s} ({' '.join(self.alias)[:16]:<16s}) "
+                f"[{self.id:<2d}] {comment}:",
                 " ".join(
                     [
-                        "%08x" % word
+                        f"{word:08x}"
                         for word in bit_string.readlist(
-                            "%d*uint:32" % (bit_string.len / 32)
+                            f"{int(bit_string.len / 32)}*uint:32"
                         )[::-1]
                     ]
                 ),
@@ -285,8 +283,8 @@ 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%d size is %d bytes, data is %d bytes"
-                % (self.id, len(self.bitarray.bytes), len(wr_data.bytes))
+                f"Data does not fit: block{self.id} size "
+                f"{len(self.bitarray.bytes)} bytes, data {len(wr_data.bytes)} bytes"
             )
         self.check_wr_rd_protect()
 
@@ -468,7 +466,7 @@ def burn(self):
         self.wr_bitarray.set(0)
 
 
-class EspEfusesBase(object):
+class EspEfusesBase:
     """
     Wrapper object to manage the efuse fields in a connected ESP bootloader
     """
@@ -674,8 +672,9 @@ def burn_block(block, postponed_efuses):
     @staticmethod
     def confirm(action, do_not_confirm):
         log.print(
-            "%s%s\nThis is an irreversible operation!"
-            % (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

@@ -9,7 +9,8 @@
 import os
 import json
 import sys
-from typing import Any, BinaryIO, Callable, TextIO
+from typing import Any, BinaryIO, TextIO
+from collections.abc import Callable
 
 import espsecure
 import rich_click as click
@@ -850,9 +851,9 @@ def print_attention(blocked_efuses_after_burn: list[str]):
         for block in self.efuses.blocks:
             burn_list_a_block = [e for e in burn_efuses_list if e.block == block.id]
             if len(burn_list_a_block):
-                log.print("  from BLOCK%d" % (block.id))
+                log.print(f"  from BLOCK{block.id}")
                 for field in burn_list_a_block:
-                    log.print("     - %s" % (field.name))
+                    log.print(f"     - {field.name}")
                     if (
                         self.efuses.blocks[field.block].get_coding_scheme()
                         != self.efuses.REGS.CODING_SCHEME_NONE
@@ -990,7 +991,7 @@ def read_protect_efuse(self, efuse_names: list[str]):
                     ]
                     if error:
                         raise esptool.FatalError(
-                            "%s must be readable, stop this operation!" % efuse_name
+                            f"{efuse_name} must be readable, stop this operation!"
                         )
                 else:
                     for block in self.efuses.Blocks.BLOCKS:
@@ -1000,8 +1001,8 @@ def read_protect_efuse(self, efuse_names: list[str]):
                                 self.efuses[block.key_purpose].get()
                             ):
                                 raise esptool.FatalError(
-                                    "%s must be readable, stop this operation!"
-                                    % efuse_name
+                                    f"{efuse_name} must be readable, "
+                                    f"stop this operation!"
                                 )
                             break
                 # make full list of which efuses will be disabled
@@ -1013,8 +1014,8 @@ def read_protect_efuse(self, efuse_names: list[str]):
                 ]
                 names = ", ".join(e.name for e in all_disabling)
                 log.print(
-                    "Permanently read-disabling eFuse%s %s"
-                    % ("s" if len(all_disabling) > 1 else "", names)
+                    f"Permanently read-disabling eFuse"
+                    f"{'s' if len(all_disabling) > 1 else ''} {names}"
                 )
                 efuse.disable_read()
 
@@ -1055,8 +1056,8 @@ def write_protect_efuse(self, efuse_names: list[str]):
                 ]
                 names = ", ".join(e.name for e in all_disabling)
                 log.print(
-                    "Permanently write-disabling eFuse%s %s"
-                    % ("s" if len(all_disabling) > 1 else "", names)
+                    f"Permanently write-disabling eFuse"
+                    f"{'s' if len(all_disabling) > 1 else ''} {names}"
                 )
                 efuse.disable_write()
 
@@ -1166,11 +1167,10 @@ def burn_bit(self, block: str, bit_number: list[int]):
             )
         data_block.reverse()
         log.print(
-            "bit_number:   "
-            "[%-03d]........................................................[0]"
-            % (data_block.len - 1)
+            f"bit_number:   [{data_block.len - 1:03d}]"
+            f"........................................................[0]"
         )
-        log.print("BLOCK%-2d   :" % block_obj.id, data_block)
+        log.print(f"BLOCK{block_obj.id:>2d}   :", data_block)
         block_obj.print_block(data_block, "regs_to_write", debug=True)
         block_obj.save(data_block.bytes[::-1])
 

espefuse/efuse/csv_table_parser.py

@@ -180,7 +180,7 @@ def print_error(p, n, state):
                         print_error(p, n, state)
 
 
-class FuseDefinition(object):
+class FuseDefinition:
     def __init__(self):
         self.field_name = ""
         self.group = ""
@@ -261,11 +261,9 @@ def get_alt_names(self, comment):
 
 class InputError(RuntimeError):
     def __init__(self, e):
-        super(InputError, self).__init__(e)
+        super().__init__(e)
 
 
 class ValidationError(InputError):
     def __init__(self, p, message):
-        super(ValidationError, self).__init__(
-            f"Entry {p.field_name} invalid: {message}"
-        )
+        super().__init__(f"Entry {p.field_name} invalid: {message}")

espefuse/efuse/emulate_efuse_controller_base.py

@@ -10,7 +10,7 @@
 from esptool.logger import log
 
 
-class EmulateEfuseControllerBase(object):
+class EmulateEfuseControllerBase:
     """The class for virtual efuse operations. Using for HOST_TEST."""
 
     CHIP_NAME = ""

espefuse/efuse/esp32/emulate_efuse_controller.py

@@ -22,7 +22,7 @@ def __init__(self, efuse_file=None, debug=False):
         self.Blocks = EfuseDefineBlocks
         self.Fields = EfuseDefineFields(None)
         self.REGS = EfuseDefineRegisters
-        super(EmulateEfuseController, self).__init__(efuse_file, debug)
+        super().__init__(efuse_file, debug)
 
     """ esptool method start >> """
 
@@ -39,7 +39,7 @@ def read_reg(self, addr):
         if addr == self.REGS.APB_CTL_DATE_ADDR:
             return self.REGS.APB_CTL_DATE_V << self.REGS.APB_CTL_DATE_S
         else:
-            return super(EmulateEfuseController, self).read_reg(addr)
+            return super().read_reg(addr)
 
     """ << esptool method end """