construct: Convert to f-string (manual)

Manually fix the remaining code which `ruff check --select
UP031,UP032,UP031 --unsafe-fixes --fix` did not update.

Convert `repr(…)` to `{…!r}`.

Signed-off-by: Philipp Hahn <phahn-oss@avm.de>

Author: pmhahn

elftools/construct/core.py

@@ -313,14 +313,14 @@ def _read_stream(stream: IO[bytes], length: int) -> bytes:
         raise ValueError("length must be >= 0", length)
     data = stream.read(length)
     if len(data) != length:
-        raise FieldError("expected %d, found %d" % (length, len(data)))
+        raise FieldError(f"expected {length}, found {len(data)}")
     return data
 
 def _write_stream(stream: IO[bytes], length: int, data: bytes) -> None:
     if length < 0:
         raise ValueError("length must be >= 0", length)
     if len(data) != length:
-        raise FieldError("expected %d, found %d" % (length, len(data)))
+        raise FieldError(f"expected {length}, found {len(data)}")
     stream.write(data)
 
 class StaticField(Construct):
@@ -452,12 +452,12 @@ def _parse(self, stream: IO[bytes], context: Container) -> ListContainer:
                     obj.append(self.subcon._parse(stream, context))
                     c += 1
         except ConstructError as ex:
-            raise ArrayError("expected %d, found %d" % (count, c), ex)
+            raise ArrayError(f"expected {count}, found {c}", ex)
         return obj
     def _build(self, obj: Any, stream: IO[bytes], context: Container) -> None:
         count = self.countfunc(context)
         if len(obj) != count:
-            raise ArrayError("expected %d, found %d" % (count, len(obj)))
+            raise ArrayError(f"expected {count}, found {len(obj)}")
         if self.subcon.conflags & self.FLAG_COPY_CONTEXT:
             for subobj in obj:
                 self.subcon._build(subobj, stream, context.__copy__())
@@ -534,14 +534,12 @@ def _parse(self, stream: IO[bytes], context: Container) -> ListContainer:
                     c += 1
         except ConstructError as ex:
             if c < self.mincount:
-                raise RangeError("expected %d to %d, found %d" %
-                    (self.mincount, self.maxcout, c), ex)
+                raise RangeError(f"expected {self.mincount} to {self.maxcout}, found {c}", ex)
             stream.seek(pos)
         return obj
     def _build(self, obj: Any, stream: IO[bytes], context: Container) -> None:
         if len(obj) < self.mincount or len(obj) > self.maxcout:
-            raise RangeError("expected %d to %d, found %d" %
-                (self.mincount, self.maxcout, len(obj)))
+            raise RangeError(f"expected {self.mincount} to {self.maxcout}, found {len(obj)}")
         cnt = 0
         try:
             if self.subcon.conflags & self.FLAG_COPY_CONTEXT:
@@ -558,8 +556,7 @@ def _build(self, obj: Any, stream: IO[bytes], context: Container) -> None:
                     cnt += 1
         except ConstructError as ex:
             if cnt < self.mincount:
-                raise RangeError("expected %d to %d, found %d" %
-                    (self.mincount, self.maxcout, len(obj)), ex)
+                raise RangeError(f"expected {self.mincount} to {self.maxcout}, found {len(obj)}", ex)
     def _sizeof(self, context: Container) -> int:
         raise SizeofError("can't calculate size")
 

elftools/construct/debug.py

@@ -48,7 +48,7 @@ def __init__(self, name: str | None = None, show_stream: bool = True,
         Construct.__init__(self, None)
         if name is None:
             Probe.counter += 1
-            name = "<unnamed %d>" % (Probe.counter,)
+            name = f"<unnamed {Probe.counter}>"
         self.printname = name
         self.show_stream = show_stream
         self.show_context = show_context

elftools/construct/lib/container.py

@@ -103,7 +103,7 @@ def copy(self) -> Self:
     __copy__ = copy
 
     def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({repr(self.__dict__)})"
+        return f"{self.__class__.__name__}({self.__dict__!r})"
 
     def __str__(self) -> str:
         return f"{self.__class__.__name__}({str(self.__dict__)})"