Fix linting for python3.10

Author: Miauwkeru

dissect/executable/elf/elf.py

@@ -3,7 +3,7 @@
 import io
 from functools import cached_property, lru_cache
 from operator import itemgetter
-from typing import TYPE_CHECKING, BinaryIO, Callable, Generic, TypeVar
+from typing import TYPE_CHECKING, BinaryIO, Generic, TypeVar
 
 from dissect.executable.elf.c_elf import (
     SHN,
@@ -19,7 +19,7 @@
 from dissect.executable.exception import InvalidSignatureError
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator
+    from collections.abc import Callable, Iterator
 
     from dissect.cstruct import cstruct
 

dissect/executable/pe/c_pe.pyi

@@ -1,8 +1,7 @@
 # Generated by cstruct-stubgen
-from typing import BinaryIO, Literal, overload
+from typing import BinaryIO, Literal, TypeAlias, overload
 
 import dissect.cstruct as __cs__
-from typing_extensions import TypeAlias
 
 class _c_pe(__cs__.cstruct):
     IMAGE_DOS_SIGNATURE: Literal[23117] = ...

dissect/executable/pe/directory/debug.py

@@ -123,7 +123,7 @@ def signature(self) -> UUID | int | None:
         if isinstance(self.info, c_pe.CV_INFO_PDB20):
             return self.info.Signature
 
-        if isinstance(self.info, (c_pe.CV_INFO_PDB70, c_pe.CV_INFO_MTOC)):
+        if isinstance(self.info, c_pe.CV_INFO_PDB70 | c_pe.CV_INFO_MTOC):
             return UUID(bytes_le=self.info.Signature)
 
         return None

dissect/executable/pe/directory/delay_import.py

@@ -126,7 +126,7 @@ def functions(self) -> list[DelayImportFunction]:
         return [
             DelayImportFunction(self, name_thunk, address_thunk, bound_thunk, unload_thunk)
             for name_thunk, address_thunk, bound_thunk, unload_thunk in zip(
-                name_table, address_table, bound_table, unload_table
+                name_table, address_table, bound_table, unload_table, strict=False
             )
         ]
 

dissect/executable/pe/directory/export.py

@@ -79,7 +79,7 @@ def functions(self) -> list[ExportFunction]:
         self.pe.vfh.seek(self.header.AddressOfNameOrdinals)
         ordinals = c_pe.USHORT[self.header.NumberOfNames](self.pe.vfh)
 
-        for name_ptr, ordinal in zip(names, ordinals):
+        for name_ptr, ordinal in zip(names, ordinals, strict=False):
             self.pe.vfh.seek(name_ptr)
             name = c_pe.CHAR[None](self.pe.vfh).decode()
 

dissect/executable/pe/directory/imports.py

@@ -108,7 +108,7 @@ def functions(self) -> list[ImportFunction]:
 
         return [
             ImportFunction(self, lookup_thunk, address_thunk)
-            for lookup_thunk, address_thunk in zip(lookup_table, address_table)
+            for lookup_thunk, address_thunk in zip(lookup_table, address_table, strict=False)
         ]
 
     @cached_property

dissect/executable/pe/directory/resource.py

@@ -2,7 +2,7 @@
 
 from functools import cached_property
 from io import BytesIO
-from typing import TYPE_CHECKING, Any, BinaryIO, Union
+from typing import TYPE_CHECKING, Any, BinaryIO
 
 from dissect.util.ts import from_unix, wintimestamp
 
@@ -57,13 +57,13 @@ def __getitem__(self, idx: int | str | c_pe.RT) -> list[Resource] | None:
         if isinstance(idx, int):
             return self.resources[idx]
 
-        if isinstance(idx, (str, c_pe.RT)):
+        if isinstance(idx, str | c_pe.RT):
             return self.get(idx)
 
         raise TypeError(f"ResourceDirectory indices must be int, str or RT enum members, not {type(idx).__name__}")
 
     def __contains__(self, idx: str | c_pe.RT) -> bool:
-        if isinstance(idx, (str, c_pe.RT)):
+        if isinstance(idx, str | c_pe.RT):
             return self.get(idx) is not None
 
         return False
@@ -108,7 +108,7 @@ def find(self, type: int | str | c_pe.RT, name: str | int) -> Resource | None:
         if isinstance(name, str):
             name = TAG_TO_LCID.get(name, name)
 
-        if isinstance(name, (int, c_pe.RT)) and (entry := root.get(name)) is not None:
+        if isinstance(name, int | c_pe.RT) and (entry := root.get(name)) is not None:
             return Resource(type, name, entry)
 
         raise KeyError(f"Resource with type {type.name!r} and name {name!r} not found")
@@ -268,7 +268,7 @@ def vs_version_info(self, language: str | int | None = None) -> dict | None:
         if len(version) != 1:
             raise ValueError(f"Expected exactly one version resource, found {len(version)}")
 
-        _Node: TypeAlias = tuple[str, Union[str, bytes, None], list["_Node"]]
+        _Node: TypeAlias = tuple[str, str | bytes | None, list["_Node"]]
 
         def _parse_lvt(fh: BinaryIO) -> _Node | None:
             start = fh.tell()

dissect/executable/pe/directory/timestamp.notes

@@ -0,0 +1,11 @@
+# Thoughts
+
+An idea to just pass `fh` to the Directories?
+An idea to pass `is_64bit()` to Directories ... etc
+
+Law of demeter. If I want this, but see no other solution, I will just mention it.
+
+Feels like the PE itself doesn't need to be there
+
+
+