Fix a bunch of trivial linty stuff

dargueta · Feb 13, 2025 · c541126 · c541126
1 parent c09ddcc
commit c541126
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 62 deletions.
diff --git a/binobj/__init__.py b/binobj/__init__.py
@@ -32,8 +32,8 @@ def __str__(self) -> str:
         # Having a version suffix is rare for this library, so we'll tell pycoverage to
         # ignore this branch.
         if self.suffix:  # pragma: no cover
-            return "%d.%d.%d-%s" % (self.major, self.minor, self.patch, self.suffix)
-        return "%d.%d.%d" % (self.major, self.minor, self.patch)
+            return f"{self.major}.{self.minor}.{self.patch}-{self.suffix}"
+        return f"{self.major}.{self.minor}.{self.patch}"
 
 
 __version__ = importlib.metadata.version("binobj")

diff --git a/binobj/fields/stringlike.py b/binobj/fields/stringlike.py
@@ -23,7 +23,7 @@
     from binobj.typedefs import StrDict
 
 
-__all__ = ["Bytes", "String", "StringZ", "UUID4", "UUIDFormat"]
+__all__ = ["UUID4", "Bytes", "String", "StringZ", "UUIDFormat"]
 
 
 class Bytes(Field[bytes]):

diff --git a/binobj/helpers.py b/binobj/helpers.py
@@ -121,6 +121,6 @@ def peek_bytes(stream: BinaryIO, count: int, short_read_okay: bool = True) -> by
 
     if not short_read_okay and len(data) < count:
         raise EOFError(
-            "Short read: expected %d bytes in stream, read %d." % (count, len(data))
+            f"Short read: expected {count} bytes in stream, read {len(data)}."
         )
     return data