fix typing issues, run black

Author: StarrFox

memobj/__init__.py

@@ -3,10 +3,20 @@
 from .allocation import Allocation, Allocator
 from .object import MemoryObject
 from .process import Process, WindowsProcess
-from .property import *
+from . import property
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
 del logging
 del logger
+
+
+__all__ = [
+    "Allocation",
+    "Allocator",
+    "MemoryObject",
+    "Process",
+    "WindowsProcess",
+    "property",
+]

memobj/hook.py

@@ -6,8 +6,15 @@
 from collections.abc import Callable
 
 import regex
-from iced_x86 import (BlockEncoder, Code, Decoder, FlowControl, Instruction,
-                      MemoryOperand, Register)
+from iced_x86 import (
+    BlockEncoder,
+    Code,
+    Decoder,
+    FlowControl,
+    Instruction,
+    MemoryOperand,
+    Register,
+)
 from iced_x86._iced_x86_py import Register as RegisterType
 
 from memobj.allocation import Allocation, Allocator

memobj/process/__init__.py

@@ -2,3 +2,6 @@
 from .module import Module
 from .windows.module import WindowsModule
 from .windows.process import WindowsProcess
+
+
+__all__ = ["Process", "Module", "WindowsModule", "WindowsProcess"]

memobj/process/windows/module.py

@@ -17,7 +17,8 @@
 """
 
 import ctypes
-from typing import TYPE_CHECKING, Iterator, Self
+from typing import TYPE_CHECKING, Self
+from collections.abc import Iterator
 
 from memobj.process import Module
 
@@ -120,7 +121,7 @@ def get_all_modules(cls, process: "WindowsProcess") -> list[Self]:
                     process=process,
                 )
             )
-        
+
         return modules
 
     def get_symbol_with_name(self, name: str) -> int:

memobj/process/windows/process.py

@@ -3,29 +3,31 @@
 import functools
 import typing
 from pathlib import Path
-from typing import Self, Union
+from typing import Self
 
 import regex
 
 from memobj.allocation import Allocator
 from memobj.process import Process
 from memobj.process.windows.module import WindowsModule
-from memobj.process.windows.utils import \
-    WindowsMemoryProtection  # TODO: what was this going to be used for?
-from memobj.process.windows.utils import (LUID, LUID_AND_ATTRIBUTES,
-                                          PROCESSENTRY32, TOKEN_PRIVILEGES,
-                                          CheckWindowsOsError,
-                                          SingleLUIDAndAttributes,
-                                          WindowsMemoryBasicInformation,
-                                          WindowsModuleInfo)
+from memobj.process.windows.utils import (
+    WindowsMemoryProtection,
+)  # TODO: what was this going to be used for?
+from memobj.process.windows.utils import (
+    LUID,
+    LUID_AND_ATTRIBUTES,
+    PROCESSENTRY32,
+    TOKEN_PRIVILEGES,
+    CheckWindowsOsError,
+    SingleLUIDAndAttributes,
+    WindowsMemoryBasicInformation,
+)
 
 
-# TODO: update everything that uses modules to use the new WindowsModule
 class WindowsProcess(Process):
     def __init__(self, process_handle: int):
         self.process_handle = process_handle
 
-    # TODO: why are we getting debug privileges for our own process?
     @staticmethod
     def _get_debug_privileges():
         with CheckWindowsOsError():
@@ -411,25 +413,6 @@ def get_modules(
         else:
             return WindowsModule.get_all_modules(self)
 
-    # def get_module_name(self, module: WindowsModuleInfo) -> str:
-    #     with CheckWindowsOsError():
-    #         # https://learn.microsoft.com/en-us/windows/win32/api/psapi/nf-psapi-getmodulebasenamew
-    #         # I just assume MAX_PATH is good enough
-    #         name_buffer = ctypes.create_unicode_buffer(ctypes.wintypes.MAX_PATH)
-
-    #         success = ctypes.windll.psapi.GetModuleBaseNameW(
-    #             self.process_handle,
-    #             ctypes.c_void_p(module.lpBaseOfDll),
-    #             ctypes.byref(name_buffer),
-    #             ctypes.wintypes.MAX_PATH,
-    #         )
-
-    #         if success == 0:
-    #             raise ValueError(f"GetModuleBaseNameW failed for {module}")
-
-    #     return name_buffer.value
-
-    # TODO: return module here
     def get_module_named(self, name: str) -> WindowsModule:
         return WindowsModule.from_name(self, name)
 

memobj/utils.py

@@ -2,7 +2,8 @@
 import struct
 import time
 from enum import Enum
-from typing import Callable, Generic, TypeVar
+from typing import Generic, TypeVar
+from collections.abc import Callable
 
 # TODO: remove when dropping 3.11 support
 T = TypeVar("T")
@@ -14,6 +15,7 @@ class ValueWaiter(Generic[T]):
     Args:
         callback (Callable[[], T]): the callable to wait for changes from
     """
+
     def __init__(self, callback: Callable[[], T]):
         self.callback = callback
 

tests/conftest.py

@@ -6,10 +6,6 @@
 from memobj import Process, WindowsProcess
 
 
-def pytest_addoption(parser):
-    parser.addoption("--run-manual", action="store_true", default=False, help="run manual tests")
-
-
 @pytest.fixture(scope="session")
 def process() -> Process:
     """

tests/manual/test_dll_injection.py

@@ -8,8 +8,12 @@
 
 
 def test_dll_injection():
-    dll_path = (Path(__file__).parent / "test_inject/target/release/test_inject.dll").resolve()
-    exe_path = (Path(__file__).parent / "test_inject/target/release/inject_target.exe").resolve()
+    dll_path = (
+        Path(__file__).parent / "test_inject/target/release/test_inject.dll"
+    ).resolve()
+    exe_path = (
+        Path(__file__).parent / "test_inject/target/release/inject_target.exe"
+    ).resolve()
 
     if not dll_path.exists():
         pytest.skip(f"Test DLL not found at {dll_path}")