Accept suggestions from new toolchain

rec · rec · commit a00f2af2fbd8 · 2026-02-03T14:46:24.000+01:00
diff --git a/hardback/book/chunk_writer.py b/hardback/book/chunk_writer.py
@@ -1,10 +1,12 @@
-from ..qr.write import write
-from ..util import files
 import itertools
 import math
 import os
+
 import yaml
 
+from ..qr.write import write
+from ..util import files
+
 
 def write_chunks(hc):
     desc = hc.hardback.desc
diff --git a/hardback/book/css.py b/hardback/book/css.py
@@ -1,4 +1,5 @@
 from pathlib import Path
+
 from ebooklib import epub
 
 CSS_DIR = Path(__file__).parents[2] / "css"
diff --git a/hardback/book/hardback.py b/hardback/book/hardback.py
@@ -1,10 +1,12 @@
-from .css import make_css
-from . import metadata
+from pathlib import Path
+
+from ebooklib import epub
+
 from ..qr.fill import fill_qr
 from ..util import hasher
 from ..util.elapsed_bar import ElapsedBar
-from ebooklib import epub
-from pathlib import Path
+from . import metadata
+from .css import make_css
 
 
 class Hardback:
diff --git a/hardback/book/metadata.py b/hardback/book/metadata.py
@@ -3,11 +3,12 @@
 representing metadata about the file.
 """
 
-from ..util import chunk_sequence, hasher
 import datetime
 import os
 import pathlib
 
+from ..util import chunk_sequence, hasher
+
 
 def metadata(desc, source):
     stat = os.stat(source)
diff --git a/hardback/book/sections.py b/hardback/book/sections.py
@@ -1,9 +1,11 @@
-from .chunk_writer import write_chunks
-from .metadata import format as metadata_format
+from pathlib import Path
+
+from ebooklib import epub
+
 from ..qr import qr_table
 from ..util import chunk_sequence
-from ebooklib import epub
-from pathlib import Path
+from .chunk_writer import write_chunks
+from .metadata import format as metadata_format
 
 
 def chapter(hc):
@@ -36,7 +38,7 @@ def metadata(hc):
 def qr_html(hc):
     def qr_code_images():
         chunks = write_chunks(hc)
-        for block_count, f in enumerate(chunks):
+        for f in chunks:
             f = Path(f)
             add_image_item(f)
             hc.hardback.desc.remove_image_files and f.unlink()
diff --git a/hardback/data/book.py b/hardback/data/book.py
@@ -1,15 +1,16 @@
-from attr import dataclass, Factory
 from pathlib import Path
 from typing import List
 
+from attr import Factory, dataclass
+
 
 @dataclass(slots=True)
 class Book:
     identifier: str = ""
     title: str = ""
     cover: str = ""
     language: str = "en"
-    authors: List[str] = Factory(list)
+    authors: list[str] = Factory(list)
 
     def apply(self, ebook):
         ebook.set_identifier(self.identifier)
diff --git a/hardback/data/cover.py b/hardback/data/cover.py
@@ -1,6 +1,7 @@
-from attr import dataclass, Factory
 from pathlib import Path
 from typing import List
+
+from attr import Factory, dataclass
 from PIL import Image, ImageDraw, ImageFont
 
 # TODO: this only works for MacOS
@@ -17,12 +18,12 @@ def create(self):
         suffix = Path(name).suffix
         if suffix == ".ttf":
             if not self.size:
-                raise ValueError(f"Size must be set for Truetype fonts")
+                raise ValueError("Size must be set for Truetype fonts")
             return ImageFont.truetype(name, self.size)
 
         if suffix == ".pil":
             if self.size:
-                raise ValueError(f"Size cannot be set for Bitmap fonts")
+                raise ValueError("Size cannot be set for Bitmap fonts")
             return ImageFont.load(name)
 
         raise ValueError(f"Do not understand font {name}")
@@ -33,8 +34,8 @@ class Cover:
     title: str = ""
     image: str = ""
     font: Font = Factory(Font)
-    margin: List[int] = Factory(lambda: [75, 50])
-    size: List[int] = Factory(lambda: [1600, 2560])
+    margin: list[int] = Factory(lambda: [75, 50])
+    size: list[int] = Factory(lambda: [1600, 2560])
 
     def render(self):
         image = Image.new("RGB", self.size, "white")
diff --git a/hardback/data/dataclass.py b/hardback/data/dataclass.py
@@ -1,8 +1,10 @@
 """Contains data classes that specify how a book is put together"""
 
-from ..qr.qr import QR
-from attr import dataclass, Factory
 from typing import List
+
+from attr import Factory, dataclass
+
+from ..qr.qr import QR
 from .book import Book
 
 
@@ -15,9 +17,9 @@ class Chapter:
 
 @dataclass(slots=True)
 class Hardback:
-    sources: List[str] = Factory(list)
+    sources: list[str] = Factory(list)
     book: Book = Factory(Book)
-    dimensions: List[int] = Factory(lambda: [5, 7])
+    dimensions: list[int] = Factory(lambda: [5, 7])
     outfile: str = ""
     qr: QR = Factory(QR)
 
diff --git a/hardback/main.py b/hardback/main.py
@@ -1,8 +1,10 @@
-from .book import cursor, hardback, sections
-from .data import serialize, dataclass
 import pathlib
+
 import yaml
 
+from .book import cursor, hardback, sections
+from .data import dataclass, serialize
+
 _DATA_SUFFIXES = ".json", ".yml"
 NEW_CHAPTERS = False
 
diff --git a/hardback/qr/codes.py b/hardback/qr/codes.py
@@ -1,4 +1,5 @@
-from attr import dataclass, Factory
+from attr import Factory, dataclass
+
 from .raw_codes import RAW_CODES
 
 
diff --git a/hardback/qr/qr.py b/hardback/qr/qr.py
@@ -1,4 +1,5 @@
 import attr
+
 from . import codes, constants
 
 
diff --git a/hardback/qr/write.py b/hardback/qr/write.py
@@ -1,10 +1,11 @@
-import segno
 import struct
 
+import segno
+
 
 def write(qr, out, index, document, block):
     document = document[: qr.document_bytes]
-    index = struct.pack(f">q", index)[: qr.index_bytes]
+    index = struct.pack(">q", index)[: qr.index_bytes]
     data = index + document + block
 
     def write(fp):
diff --git a/hardback/util/elapsed_bar.py b/hardback/util/elapsed_bar.py
@@ -1,4 +1,5 @@
 import datetime
+
 from progress.bar import ChargingBar
 
 
@@ -22,7 +23,7 @@ def next_item(self, message):
         def fmt(t):
             return str(t).split(".", 1)[0]
 
-        self.message = "%s %s elapsed, %s to go" % (
+        self.message = "{} {} elapsed, {} to go".format(
             message,
             fmt(elapsed),
             fmt(remaining),
diff --git a/hardback/util/hasher.py b/hardback/util/hasher.py
@@ -1,4 +1,5 @@
 import hashlib
+
 from . import files
 
 HASHER = hashlib.sha256
diff --git a/test/hardback/book/hardback_test.py b/test/hardback/book/hardback_test.py
@@ -1,9 +1,11 @@
+from pathlib import Path
+
 from ebooklib import epub
+from pyfakefs.fake_filesystem_unittest import TestCase as FakeTestCase
+
 from hardback.book import css, hardback
 from hardback.data.book import Book
 from hardback.data.dataclass import Chapter, Hardback
-from pathlib import Path
-from pyfakefs.fake_filesystem_unittest import TestCase as FakeTestCase
 
 DIR = Path(__file__).parent
 
diff --git a/test/hardback/data/cover_test.py b/test/hardback/data/cover_test.py
@@ -1,7 +1,9 @@
 import unittest
-from hardback.data.cover import Cover, Font
 from pathlib import Path
+
 from PIL import Image
+
+from hardback.data.cover import Cover, Font
 from test.hardback import skip_tests
 
 BASE = Path(__file__).parent
diff --git a/test/hardback/data/serialize_test.py b/test/hardback/data/serialize_test.py
@@ -1,7 +1,9 @@
 import unittest
-from attr import dataclass, Factory
-from hardback.data.serialize import serialize, unserialize
+
+from attr import Factory, dataclass
+
 from hardback.data.dataclass import Hardback
+from hardback.data.serialize import serialize, unserialize
 
 
 class SerializeTest(unittest.TestCase):
diff --git a/test/hardback/qr/fill_test.py b/test/hardback/qr/fill_test.py
@@ -1,8 +1,9 @@
+import copy
+import unittest
+
 from hardback.qr import fill
 from hardback.qr.constants import Default
 from hardback.qr.qr import QR
-import copy
-import unittest
 
 DEFAULT = QR(Default.version, Default.error, Default.block_size)
 
diff --git a/test/hardback/qr/qr_table_test.py b/test/hardback/qr/qr_table_test.py
@@ -1,4 +1,5 @@
 import unittest
+
 from hardback.qr.qr_table import qr_table
 
 
diff --git a/test/hardback/util/chunk_sequence_test.py b/test/hardback/util/chunk_sequence_test.py
@@ -1,4 +1,5 @@
 import unittest
+
 from hardback.util import chunk_sequence
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from pathlib import Path`
	`2`	`+`
`2`	`3`	`from ebooklib import epub`
`3`	`4`
`4`	`5`	`CSS_DIR = Path(__file__).parents[2] / "css"`