dissect.cstruct 4.0.dev1__tar.gz → 4.0.dev3__tar.gz

{dissect_cstruct-4.0.dev1/dissect.cstruct.egg-info → dissect_cstruct-4.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev1
+Version: 4.0.dev3
 Summary: A Dissect module implementing a parser for C-like structures: structure parsing in Python made easy
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Apache License 2.0

{dissect_cstruct-4.0.dev1 → dissect_cstruct-4.0.dev3}/dissect/cstruct/types/enum.py

@@ -11,6 +11,7 @@ if TYPE_CHECKING:
 
 
 PY_311 = sys.version_info >= (3, 11, 0)
+PY_312 = sys.version_info >= (3, 12, 0)
 
 
 class EnumMetaType(EnumMeta, MetaType):
@@ -56,6 +57,13 @@ class EnumMetaType(EnumMeta, MetaType):
 
     __len__ = MetaType.__len__
 
+    if not PY_312:
+        # Backport __contains__ from CPython 3.12
+        def __contains__(cls, value: Any) -> bool:
+            if isinstance(value, cls):
+                return True
+            return value in cls._value2member_map_
+
     def _read(cls, stream: BinaryIO, context: dict[str, Any] = None) -> Enum:
         return cls(cls.type._read(stream, context))
 
@@ -174,10 +182,7 @@ class Enum(BaseType, IntEnum, metaclass=EnumMetaType):
     @classmethod
     def _missing_(cls, value: int) -> Enum:
         # Emulate FlagBoundary.KEEP for enum (allow values other than the defined members)
-        pseudo_member = cls._value2member_map_.get(value, None)
-        if pseudo_member is None:
-            new_member = int.__new__(cls, value)
-            new_member._name_ = None
-            new_member._value_ = value
-            pseudo_member = cls._value2member_map_.setdefault(value, new_member)
-        return pseudo_member
+        new_member = int.__new__(cls, value)
+        new_member._name_ = None
+        new_member._value_ = value
+        return new_member

{dissect_cstruct-4.0.dev1 → dissect_cstruct-4.0.dev3}/dissect/cstruct/types/structure.py

@@ -49,7 +49,7 @@ class StructureMetaType(MetaType):
 
     def __new__(metacls, name: str, bases: tuple[type, ...], classdict: dict[str, Any]) -> MetaType:
         if (fields := classdict.pop("fields", None)) is not None:
-            metacls._update_fields(metacls, fields, align=classdict.get("align", False), classdict=classdict)
+            metacls._update_fields(metacls, fields, align=classdict.get("__align__", False), classdict=classdict)
 
         return super().__new__(metacls, name, bases, classdict)
 

{dissect_cstruct-4.0.dev1 → dissect_cstruct-4.0.dev3/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev1
+Version: 4.0.dev3
 Summary: A Dissect module implementing a parser for C-like structures: structure parsing in Python made easy
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Apache License 2.0

{dissect_cstruct-4.0.dev1 → dissect_cstruct-4.0.dev3}/tests/test_types_enum.py

@@ -34,6 +34,18 @@ def test_enum(cs: cstruct, TestEnum: type[Enum]) -> None:
     assert TestEnum(0).name is None
     assert TestEnum(0).value == 0
 
+    assert 0 not in TestEnum
+    assert 1 in TestEnum
+    assert 2 in TestEnum
+    assert 3 in TestEnum
+    assert 4 not in TestEnum
+
+    assert TestEnum.A in TestEnum
+
+    # Mixing enums is not allowed
+    OtherEnum = cs._make_enum("Other", cs.uint8, {"A": 1, "B": 2, "C": 3})
+    assert OtherEnum.A not in TestEnum
+
 
 def test_enum_read(TestEnum: type[Enum]) -> None:
     assert TestEnum(b"\x02") == TestEnum.B

{dissect_cstruct-4.0.dev1 → dissect_cstruct-4.0.dev3}/tests/test_types_structure.py

@@ -9,7 +9,7 @@ from dissect.cstruct.cstruct import cstruct
 from dissect.cstruct.exceptions import ParserError
 from dissect.cstruct.types.base import Array, BaseType
 from dissect.cstruct.types.pointer import Pointer
-from dissect.cstruct.types.structure import Field, Structure
+from dissect.cstruct.types.structure import Field, Structure, StructureMetaType
 
 from .utils import verify_compiled
 
@@ -529,3 +529,11 @@ def test_structure_definition_self(cs: cstruct) -> None:
 
     assert issubclass(cs.test.fields["b"].type, Pointer)
     assert cs.test.fields["b"].type.type is cs.test
+
+
+def test_align_struct_in_struct(cs: cstruct) -> None:
+    with patch.object(StructureMetaType, "_update_fields") as update_fields:
+        cs._make_struct("test", [Field("a", cs.uint64)], align=True)
+
+        _, kwargs = update_fields.call_args
+        assert kwargs["align"]