oh how i love merge conflicts

Author: ZeroIntensity

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 ZeroIntensity
+Copyright (c) 2023 ZeroIntensity
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/pointers/api_bindings.py

@@ -3,7 +3,12 @@
 from ._pyapi import API_FUNCS, Func
 from .base_pointers import BaseObjectPointer
 from .bindings import (
-    CharLike, PointerLike, StringLike, binding_base, make_char, make_string
+    CharLike,
+    PointerLike,
+    StringLike,
+    binding_base,
+    make_char,
+    make_string,
 )
 from .std_structs import *
 from .structure import StructPointer

src/pointers/bindings.py

@@ -3,8 +3,17 @@
 import warnings
 from types import FunctionType
 from typing import (
-    TYPE_CHECKING, Any, Callable, Dict, Iterable, Iterator, Optional, Sequence,
-    Type, TypeVar, Union
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    Iterable,
+    Iterator,
+    Optional,
+    Sequence,
+    Type,
+    TypeVar,
+    Union,
 )
 
 from _pointers import add_ref

src/pointers/c_pointer.py

@@ -1,8 +1,6 @@
 import ctypes
 from abc import ABC, abstractmethod
-from typing import (
-    TYPE_CHECKING, Any, Callable, Iterator, List, Optional, Type, TypeVar
-)
+from typing import TYPE_CHECKING, Any, Callable, Iterator, List, Optional, Type, TypeVar
 
 from typing_extensions import ParamSpec
 

src/pointers/decay.py

@@ -3,9 +3,7 @@
 from functools import wraps
 from typing import Any, Callable, Dict, Tuple, TypeVar
 
-from typing_extensions import (
-    Annotated, ParamSpec, get_args, get_origin, get_type_hints
-)
+from typing_extensions import Annotated, ParamSpec, get_args, get_origin, get_type_hints
 
 from .object_pointer import Pointer, to_ptr
 

src/pointers/std_structs.py

@@ -3,9 +3,19 @@
 
 from ._cstd import div_t, lconv, ldiv_t, tm
 from ._pyapi import (
-    Py_buffer, Py_tss_t, PyCodeObject, PyFrameObject, PyGetSetDef,
-    PyInterpreterState, PyMethodDef, PyModuleDef, PyThreadState, PyType_Slot,
-    PyType_Spec, PyTypeObject, PyVarObject
+    Py_buffer,
+    Py_tss_t,
+    PyCodeObject,
+    PyFrameObject,
+    PyGetSetDef,
+    PyInterpreterState,
+    PyMethodDef,
+    PyModuleDef,
+    PyThreadState,
+    PyType_Slot,
+    PyType_Spec,
+    PyTypeObject,
+    PyVarObject,
 )
 from .c_pointer import TypedCPointer, VoidPointer
 from .structure import Struct, StructPointer

src/pointers/util.py

@@ -3,9 +3,7 @@
 from contextlib import suppress
 from functools import wraps
 from io import UnsupportedOperation
-from typing import (
-    TYPE_CHECKING, Any, Callable, NamedTuple, Type, TypeVar, Union
-)
+from typing import TYPE_CHECKING, Any, Callable, NamedTuple, Type, TypeVar, Union
 
 from typing_extensions import ParamSpec
 

tests/test_allocation.py

@@ -3,8 +3,15 @@
 from ward import raises, test
 
 from pointers import (
-    DereferenceError, FreedMemoryError, InvalidSizeError,
-    StackAllocatedPointer, acquire_stack_alloc, calloc, free, malloc, realloc
+    DereferenceError,
+    FreedMemoryError,
+    InvalidSizeError,
+    StackAllocatedPointer,
+    acquire_stack_alloc,
+    calloc,
+    free,
+    malloc,
+    realloc,
 )
 
 
@@ -114,6 +121,7 @@ def __init__(self, value: str) -> None:
     free(ptr)
     assert obj.value == "hello"
 
+
 @test("stack allocation")
 def _():
     @acquire_stack_alloc(24)

tests/test_bindings.py

@@ -1,12 +1,28 @@
 from ward import raises, test
 
 from pointers import (
-    InvalidBindingParameter, Struct, StructPointer, TypedCPointer, VoidPointer
+    InvalidBindingParameter,
+    Struct,
+    StructPointer,
+    TypedCPointer,
+    VoidPointer,
 )
 from pointers import _cstd as std
 from pointers import (
-    binds, c_free, c_malloc, cast, div, isspace, signal, sprintf, strcpy,
-    strlen, to_c_ptr, to_struct_ptr, to_voidp, toupper
+    binds,
+    c_free,
+    c_malloc,
+    cast,
+    div,
+    isspace,
+    signal,
+    sprintf,
+    strcpy,
+    strlen,
+    to_c_ptr,
+    to_struct_ptr,
+    to_voidp,
+    toupper,
 )
 from pointers.std_structs import DivT
 
@@ -93,6 +109,7 @@ class MyStruct(Struct):
     assert ~cast(s.e, str) == "hello"
 
     with raises(TypeError):
+
         class Foo(Struct):
             bar: TypedCPointer