chore(attrs): standardize on attrs package import

`attr` is the legacy module name, containing `s` and `ib`, which are
not exposed through `attrs` which also matches the package name.

For reasoing, see the previous commit.

Author: vlaci

pyproject.toml

@@ -90,6 +90,7 @@ select = [
   "T10",    # flake8-debugger
   "T20",    # flake8-print
   "TC",     # flake8-type-checking
+  "TID251", # flake8-tidy-imports; banned-api
   "TRY",    # tryceratops
   "UP",     # pyupgrade
   "W",      # pycodestyle (warnings)
@@ -144,6 +145,9 @@ fixture-parentheses = false
 mark-parentheses = false
 parametrize-names-type = "csv"
 
+[tool.ruff.lint.flake8-tidy-imports.banned-api]
+"attr".msg = "Use `attrs` (with an 's') instead"
+
 [tool.pytest.ini_options]
 addopts = "--cov=unblob --cov=tests --cov-branch --cov-fail-under=90"
 norecursedirs = """

tests/test_finder.py

@@ -1,4 +1,4 @@
-import attr
+import attrs
 import pytest
 from pyperscan import Scan
 
@@ -233,4 +233,4 @@ def test_search_chunks(content, expected_chunks, task_result):
 
     assert len(chunks) == len(expected_chunks)
     for expected_chunk, chunk in zip(expected_chunks, chunks):
-        assert attr.evolve(chunk, id="") == attr.evolve(expected_chunk, id="")
+        assert attrs.evolve(chunk, id="") == attrs.evolve(expected_chunk, id="")

tests/test_processing.py

@@ -6,7 +6,7 @@
 from statistics import mean
 from typing import Optional, TypeVar
 
-import attr
+import attrs
 import pytest
 
 from unblob import handlers
@@ -54,7 +54,7 @@ def assert_same_chunks(expected, actual, explanation=None):
     """Assert ignoring the chunk.id-s."""
     assert len(expected) == len(actual), explanation
     for e, a in zip(expected, actual):
-        assert attr.evolve(e, id="") == attr.evolve(a, id=""), explanation
+        assert attrs.evolve(e, id="") == attrs.evolve(a, id=""), explanation
 
 
 @pytest.mark.parametrize(

unblob/dependencies.py

@@ -1,11 +1,11 @@
 import shutil
 
-import attr
+import attrs
 
 from .models import DirectoryHandlers, Handlers
 
 
-@attr.define
+@attrs.define
 class Dependency:
     command: str
     is_installed: bool

unblob/handlers/archive/cpio.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Optional
 
-import attr
+import attrs
 from structlog import get_logger
 
 from ...file_utils import (
@@ -110,7 +110,7 @@
 """
 
 
-@attr.define
+@attrs.define
 class CPIOEntry:
     start_offset: int
     size: int

unblob/handlers/archive/qnap/qnap_nas.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Optional
 
-import attr
+import attrs
 from pyperscan import Flag, Pattern, Scan, StreamDatabase
 from structlog import get_logger
 
@@ -36,7 +36,7 @@
 ]
 
 
-@attr.define
+@attrs.define
 class QTSSearchContext:
     start_offset: int
     file: File

unblob/handlers/compression/bzip2.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-import attr
+import attrs
 from pyperscan import Flag, Pattern, Scan, StreamDatabase
 from structlog import get_logger
 
@@ -63,7 +63,7 @@ def build_stream_end_scan_db(pattern_list):
 parser = StructParser(C_DEFINITIONS)
 
 
-@attr.define
+@attrs.define
 class Bzip2SearchContext:
     start_offset: int
     file: File

unblob/handlers/compression/xz.py

@@ -1,7 +1,7 @@
 import io
 from typing import Optional
 
-import attr
+import attrs
 from pyperscan import Flag, Pattern, Scan, StreamDatabase
 from structlog import get_logger
 
@@ -61,7 +61,7 @@ def build_stream_end_scan_db(pattern_list):
 hyperscan_stream_end_magic_db = build_stream_end_scan_db(STREAM_END_MAGIC_PATTERNS)
 
 
-@attr.define
+@attrs.define
 class XZSearchContext:
     start_offset: int
     file: File

unblob/handlers/executable/elf.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Optional
 
-import attr
+import attrs
 import lief
 from structlog import get_logger
 
@@ -29,7 +29,7 @@
 KERNEL_INIT_DATA_SECTION = ".init.data"
 
 
-@attr.define(repr=False)
+@attrs.define(repr=False)
 class ElfChunk(ValidChunk):
     def extract(self, inpath: Path, outdir: Path):
         # ELF file extraction is special in that in the general case no new files are extracted, thus

unblob/handlers/filesystem/yaffs.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 from typing import Optional
 
-import attr
+import attrs
 from structlog import get_logger
 from treelib import Tree
 from treelib.exceptions import NodeIDAbsentError
@@ -141,59 +141,59 @@ class YaffsObjectType(IntEnum):
     SPECIAL = 5
 
 
-@attr.define
+@attrs.define
 class YAFFSChunk:
     chunk_id: int
     offset: int
     byte_count: int
     object_id: int
 
 
-@attr.define
+@attrs.define
 class YAFFS1Chunk(YAFFSChunk):
     serial: int
     ecc: bytes
     page_status: int
     block_status: int
 
 
-@attr.define
+@attrs.define
 class YAFFS2Chunk(YAFFSChunk):
     seq_number: int
 
 
-@attr.define
+@attrs.define
 class YAFFSFileVar:
     file_size: int
     stored_size: int
     shrink_size: int
     top_level: int
 
 
-@attr.define
+@attrs.define
 class YAFFSConfig:
     endianness: Endian
     page_size: int
     spare_size: int
     ecc: bool
 
 
-@attr.define
+@attrs.define
 class YAFFSEntry:
     object_type: YaffsObjectType
     object_id: int
     parent_obj_id: int
-    sum_no_longer_used: int = attr.ib(default=0)
-    name: str = attr.ib(default="")
-    alias: str = attr.ib(default="")
-    equiv_id: int = attr.ib(default=0)
-    file_size: int = attr.ib(default=0)
-    st_mode: int = attr.ib(default=0)
-    st_uid: int = attr.ib(default=0)
-    st_gid: int = attr.ib(default=0)
-    st_atime: int = attr.ib(default=0)
-    st_mtime: int = attr.ib(default=0)
-    st_ctime: int = attr.ib(default=0)
+    sum_no_longer_used: int = attrs.field(default=0)
+    name: str = attrs.field(default="")
+    alias: str = attrs.field(default="")
+    equiv_id: int = attrs.field(default=0)
+    file_size: int = attrs.field(default=0)
+    st_mode: int = attrs.field(default=0)
+    st_uid: int = attrs.field(default=0)
+    st_gid: int = attrs.field(default=0)
+    st_atime: int = attrs.field(default=0)
+    st_mtime: int = attrs.field(default=0)
+    st_ctime: int = attrs.field(default=0)
 
     def __lt__(self, other):
         return self.object_id < other.object_id
@@ -208,18 +208,18 @@ def __str__(self):
         return f"{self.object_id}: {self.name}"
 
 
-@attr.define(kw_only=True)
+@attrs.define(kw_only=True)
 class YAFFS2Entry(YAFFSEntry):
-    chksum: int = attr.ib(default=0)
-    st_rdev: int = attr.ib(default=0)
-    win_ctime: list[int] = attr.ib(default=[])
-    win_mtime: list[int] = attr.ib(default=[])
-    inband_shadowed_obj_id: int = attr.ib(default=0)
-    inband_is_shrink: int = attr.ib(default=0)
-    reserved: list[int] = attr.ib(default=[])
-    shadows_obj: int = attr.ib(default=0)
-    is_shrink: int = attr.ib(default=0)
-    filehead: YAFFSFileVar = attr.ib(default=None)
+    chksum: int = attrs.field(default=0)
+    st_rdev: int = attrs.field(default=0)
+    win_ctime: list[int] = attrs.field(default=[])
+    win_mtime: list[int] = attrs.field(default=[])
+    inband_shadowed_obj_id: int = attrs.field(default=0)
+    inband_is_shrink: int = attrs.field(default=0)
+    reserved: list[int] = attrs.field(default=[])
+    shadows_obj: int = attrs.field(default=0)
+    is_shrink: int = attrs.field(default=0)
+    filehead: YAFFSFileVar = attrs.field(default=None)
 
 
 def iterate_over_file(