cbridge 0.2.0__tar.gz → 0.2.2__tar.gz

{cbridge-0.2.0 → cbridge-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cbridge
-Version: 0.2.0
+Version: 0.2.2
 Summary: Creating ctype structure like dataclass
 Author: ZhengYu, Xu
 Author-email: ZhengYu, Xu <zen-xu@outlook.com>
@@ -177,9 +177,6 @@ print(Config(name=b"test"))  # Config(name=b'test', timeout=30, flags=[0, 1])
 
 ### Pointer Operations
 
-> [!WARNING]
-> Python 3.13 and above are currently not supported forward declarations
-
 ```python
 from cbridge import CStruct
 from cbridge import types

{cbridge-0.2.0 → cbridge-0.2.2}/README.md

@@ -154,9 +154,6 @@ print(Config(name=b"test"))  # Config(name=b'test', timeout=30, flags=[0, 1])
 
 ### Pointer Operations
 
-> [!WARNING]
-> Python 3.13 and above are currently not supported forward declarations
-
 ```python
 from cbridge import CStruct
 from cbridge import types

{cbridge-0.2.0 → cbridge-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cbridge"
-version = "0.2.0"
+version = "0.2.2"
 authors = [{ name = "ZhengYu, Xu", email = "zen-xu@outlook.com" }]
 description = "Creating ctype structure like dataclass"
 requires-python = ">=3.9"

{cbridge-0.2.0 → cbridge-0.2.2}/src/cbridge/__init__.py

@@ -5,7 +5,7 @@ from .cbridge import field
 from .cfunc import cfunc
 
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 __authors__ = [
     "ZhengYu, Xu <zen-xu@outlook.com>",
 ]

{cbridge-0.2.0 → cbridge-0.2.2}/src/cbridge/cbridge.py

@@ -36,10 +36,24 @@ class CStructType(_CStructType):
         pack: int = 0,
         **extra,
     ):
-        if sys.version_info >= (3, 13):
-            attrs["_fields_"] = []
-        attrs["_pack_"] = pack
-        cls = super().__new__(meta_self, name, bases, attrs)
+        if pack:
+            attrs["_pack_"] = pack
+            # Python 3.14+ only allows _pack_ with the MSVC-compatible layout
+            attrs["_layout_"] = "ms"
+        return super().__new__(meta_self, name, bases, attrs)
+
+    # Since Python 3.13, ctypes initializes structure storage info in tp_init
+    # instead of tp_new, so field resolution (which may create pointers to the
+    # class itself for forward declarations) must happen after super().__init__
+    def __init__(
+        cls,  # noqa: N805
+        name: str,
+        bases: tuple[type, ...],
+        attrs: dict[str, Any],
+        pack: int = 0,
+        **extra,
+    ):
+        super().__init__(name, bases, attrs)
         fields_map = {
             f_name: f_type
             for f_name, f_type in get_type_hints(
@@ -50,14 +64,11 @@ class CStructType(_CStructType):
         fields = list(fields_map.items())
         if fields:
             # update fields
-            if sys.version_info >= (3, 13):
-                cls._fields_[:] = fields
-            else:
-                cls._fields_ = fields
+            cls._fields_ = fields
 
-        cls = ds.dataclass(cls)
+        ds.dataclass(cls)
 
-        @wraps(cls.__init__)
+        @wraps(cls.__init__)  # type: ignore[misc]
         def wrapped_init(self, *args, **kwargs):
             args = list(args)
 
@@ -86,9 +97,7 @@ class CStructType(_CStructType):
 
             return ctypes.Structure.__init__(self, **kwargs)
 
-        cls.__init__ = wrapped_init
-
-        return cls
+        cls.__init__ = wrapped_init  # type: ignore[misc]
 
 
 field = ds.field

{cbridge-0.2.0 → cbridge-0.2.2}/src/cbridge/types.py

@@ -1,4 +1,5 @@
 # pyright: reportGeneralTypeIssues=false
+import builtins
 import ctypes
 
 from collections.abc import Sequence
@@ -18,6 +19,10 @@ if TYPE_CHECKING:
     from typing_extensions import Self
 
     class CData(_CData, Generic[_T]):
+        def __lt__(self, other: Any) -> bool: ...
+        def __le__(self, other: Any) -> bool: ...
+        def __gt__(self, other: Any) -> bool: ...
+        def __ge__(self, other: Any) -> bool: ...
         def __iadd__(self, other: _T) -> Self: ...
         def __isub__(self, other: _T) -> Self: ...
         def __imul__(self, other: _T) -> Self: ...
@@ -47,32 +52,33 @@ if TYPE_CHECKING:
         def __abs__(self) -> Self: ...
         def __invert__(self) -> Self: ...
 
-    bool = Union[bool, CData[bool]]
-    byte = Union[bytes, CData[bytes]]
-    char = Union[bytes, CData[bytes]]
-    double = Union[float, CData[float]]
-    float = Union[float, CData[float]]
-    ubyte = Union[bytes, CData[bytes]]
-    int = Union[int, CData[int]]
-    int8 = Union[int, CData[int]]
-    int16 = Union[int, CData[int]]
-    int32 = Union[int, CData[int]]
-    int64 = Union[int, CData[int]]
-    long = Union[int, CData[int]]
-    longdouble = Union[float, CData[float]]
-    longlong = Union[float, CData[float]]
-    short = Union[int, CData[int]]
-    size_t = Union[int, CData[int]]
-    ssize_t = Union[int, CData[int]]
-    uint = Union[int, CData[int]]
-    uint8 = Union[int, CData[int]]
-    uint16 = Union[int, CData[int]]
-    uint32 = Union[int, CData[int]]
-    uint64 = Union[int, CData[int]]
-    ulong = Union[int, CData[int]]
-    ulonglong = Union[int, CData[int]]
-    ushort = Union[int, CData[int]]
-    wchar = Union[str, CData[str]]
+    _CDataType = Union[_T, CData[_T]]
+    bool = _CDataType[builtins.bool]
+    byte = _CDataType[builtins.bytes]
+    char = _CDataType[builtins.bytes]
+    double = _CDataType[builtins.float]
+    float = _CDataType[builtins.float]
+    ubyte = _CDataType[builtins.bytes]
+    int = _CDataType[builtins.int]
+    int8 = _CDataType[builtins.int]
+    int16 = _CDataType[builtins.int]
+    int32 = _CDataType[builtins.int]
+    int64 = _CDataType[builtins.int]
+    long = _CDataType[builtins.int]
+    longdouble = _CDataType[builtins.float]
+    longlong = _CDataType[builtins.float]
+    short = _CDataType[builtins.int]
+    size_t = _CDataType[builtins.int]
+    ssize_t = _CDataType[builtins.int]
+    uint = _CDataType[builtins.int]
+    uint8 = _CDataType[builtins.int]
+    uint16 = _CDataType[builtins.int]
+    uint32 = _CDataType[builtins.int]
+    uint64 = _CDataType[builtins.int]
+    ulong = _CDataType[builtins.int]
+    ulonglong = _CDataType[builtins.int]
+    ushort = _CDataType[builtins.int]
+    wchar = _CDataType[builtins.str]
     void_ptr = Union[ctypes.c_void_p, Any]
 
     _Len = TypeVar("_Len")
@@ -126,8 +132,6 @@ else:
     char_ptr = ctypes.c_char_p
     wchar_ptr = ctypes.c_wchar_p
 
-    import builtins
-
     from typing import get_args
 
     class Array: