style: fix some wrong type annotations in the codebase

Author: MrIndeciso

libdestruct/backing/fake_resolver.py

@@ -6,13 +6,15 @@
 
 from __future__ import annotations
 
+from typing import Literal
+
 from libdestruct.backing.resolver import Resolver
 
 
 class FakeResolver(Resolver):
     """A class that can resolve elements in a simulated memory storage."""
 
-    def __init__(self: FakeResolver, memory: dict | None = None, address: int | None = 0, endianness: str = "little") -> None:
+    def __init__(self: FakeResolver, memory: dict | None = None, address: int | None = 0, endianness: Literal["little", "big"] = "little") -> None:
         """Initializes a basic fake resolver."""
         self.memory = memory if memory is not None else {}
         self.address = address

libdestruct/backing/memory_resolver.py

@@ -6,7 +6,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal
 
 from libdestruct.backing.resolver import Resolver
 
@@ -17,7 +17,7 @@
 class MemoryResolver(Resolver):
     """A class that can resolve itself to a value in a referenced memory storage."""
 
-    def __init__(self: MemoryResolver, memory: MutableSequence, address: int | None, endianness: str = "little") -> None:
+    def __init__(self: MemoryResolver, memory: MutableSequence, address: int | None, endianness: Literal["little", "big"] = "little") -> None:
         """Initializes a basic memory resolver."""
         self.memory = memory
         self.address = address

libdestruct/backing/resolver.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+from typing import Literal
 
 from typing_extensions import Self
 
@@ -16,7 +17,7 @@ class Resolver(ABC):
 
     parent: Self
 
-    endianness: str = "little"
+    endianness: Literal["little", "big"] = "little"
     """The endianness of the data this resolver accesses."""
 
     @abstractmethod

libdestruct/c/c_integer_types.py

@@ -28,6 +28,7 @@ def get(self: _c_integer) -> int:
     def to_bytes(self: _c_integer) -> bytes:
         """Return the serialized representation of the object."""
         if self._frozen:
+            assert isinstance(self._frozen_value, int)
             return self._frozen_value.to_bytes(self.size, self.endianness, signed=self.signed)
 
         return self.resolver.resolve(self.size, 0)

libdestruct/c/c_str.py

@@ -6,6 +6,8 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterator
+
 from libdestruct.common.array.array import array
 
 
@@ -54,7 +56,7 @@ def __setitem__(self: c_str, index: int, value: bytes) -> None:
         """Set the character at the given index to the given value."""
         self._set(value, index)
 
-    def __iter__(self: c_str) -> iter:
+    def __iter__(self: c_str) -> Iterator:
         """Return an iterator over the string."""
         for i in range(self.count()):
             yield self.get(i)

libdestruct/common/array/array.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 from abc import abstractmethod
+from collections.abc import Iterator
 from types import GenericAlias
 
 from libdestruct.common.obj import obj
@@ -42,7 +43,7 @@ def __setitem__(self: array, index: int, value: object) -> None:
         self.set(index, value)
 
     @abstractmethod
-    def __iter__(self: array) -> iter:
+    def __iter__(self: array) -> Iterator:
         """Return an iterator over the array."""
 
     def __contains__(self: array, value: object) -> bool:

libdestruct/common/enum/enum.py

@@ -30,8 +30,8 @@ def __class_getitem__(cls, params: tuple) -> GenericAlias:
     python_enum: type[Enum]
     """The backing Python enum."""
 
-    _backing_type: type[obj]
-    """The backing type."""
+    _backing_type: obj
+    """The inflated backing instance."""
 
     lenient: bool
     """Whether the conversion is lenient or not."""

libdestruct/common/enum/int_enum_field.py

@@ -58,7 +58,7 @@ def __init__(
             case _:
                 raise ValueError("The size of the field must be a power of 2.")
 
-    def inflate(self: IntEnumField, resolver: Resolver) -> int:
+    def inflate(self: IntEnumField, resolver: Resolver) -> enum:
         """Inflate the field.
 
         Args:

libdestruct/common/flags/flags.py

@@ -30,8 +30,8 @@ def __class_getitem__(cls, params: tuple) -> GenericAlias:
     python_flag: type[IntFlag]
     """The backing Python IntFlag."""
 
-    _backing_type: type[obj]
-    """The backing type."""
+    _backing_type: obj
+    """The inflated backing instance."""
 
     lenient: bool
     """Whether the conversion is lenient or not."""

libdestruct/common/inflater.py

@@ -6,7 +6,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal
 
 from libdestruct.backing.memory_resolver import MemoryResolver
 from libdestruct.common.type_registry import TypeRegistry
@@ -21,7 +21,7 @@
 class Inflater:
     """The memory manager, which inflates any memory-referencing type."""
 
-    def __init__(self: Inflater, memory: MutableSequence, endianness: str = "little") -> None:
+    def __init__(self: Inflater, memory: MutableSequence, endianness: Literal["little", "big"] = "little") -> None:
         """Initialize the memory manager."""
         self.memory = memory
         self.endianness = endianness