dissect.cstruct 4.0.dev5__tar.gz → 4.0.dev7__tar.gz

{dissect_cstruct-4.0.dev5/dissect.cstruct.egg-info → dissect_cstruct-4.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev5
+Version: 4.0.dev7
 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.dev5 → dissect_cstruct-4.0.dev7}/dissect/cstruct/types/structure.py

@@ -111,6 +111,8 @@ class StructureMetaType(MetaType):
             classdict["__init__"] = _patch_args_and_attributes(_make__init__(len(init_names)), init_names)
             classdict["__eq__"] = _patch_attributes(_make__eq__(num_fields), field_names, 1)
 
+        classdict["__hash__"] = _patch_attributes(_make__hash__(num_fields), field_names, 1)
+
         # If we're calling this as a class method or a function on the metaclass
         if issubclass(cls, type):
             size, alignment = cls._calculate_size_and_offsets(cls, fields, align)
@@ -676,3 +678,15 @@ def _make__bool__(fields: list[str]) -> str:
     """
 
     return dedent(code)
+
+
+@_codegen
+def _make__hash__(fields: list[str]) -> str:
+    vals = ", ".join(f"self.{name}" for name in fields)
+
+    code = f"""
+    def __hash__(self):
+        return hash(({vals}))
+    """
+
+    return dedent(code)

{dissect_cstruct-4.0.dev5 → dissect_cstruct-4.0.dev7/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev5
+Version: 4.0.dev7
 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.dev5 → dissect_cstruct-4.0.dev7}/tests/test_types_structure.py

@@ -46,6 +46,9 @@ def test_structure(TestStruct: type[Structure]) -> None:
     assert obj.b is None
     assert len(obj) == 8
 
+    # Test hashing of values
+    assert hash((obj.a, obj.b)) == hash(obj)
+
 
 def test_structure_read(TestStruct: type[Structure]) -> None:
     obj = TestStruct(b"\x01\x00\x00\x00\x02\x00\x00\x00")

{dissect_cstruct-4.0.dev5 → dissect_cstruct-4.0.dev7}/tests/test_types_union.py

@@ -41,6 +41,8 @@ def test_union(TestUnion: type[Union]) -> None:
     assert obj.b is None
     assert len(obj) == 4
 
+    assert hash((obj.a, obj.b)) == hash(obj)
+
 
 def test_union_read(TestUnion: type[Union]) -> None:
     obj = TestUnion(b"\x01\x00\x00\x00")
@@ -288,7 +290,7 @@ def test_union_update(cs: cstruct) -> None:
     assert obj.a == 2
     obj.b = 0xFFFF
     assert obj.a == 0xFF
-    assert obj.dumps() == b"\xFF\xFF"
+    assert obj.dumps() == b"\xff\xff"
 
 
 def test_union_nested_update(cs: cstruct) -> None:

{dissect_cstruct-4.0.dev5 → dissect_cstruct-4.0.dev7}/tox.ini

@@ -5,10 +5,11 @@ envlist = lint, py3, pypy3
 # locally installed tox to have a minimum version 3.3.0. This means the names
 # of the configuration options are still according to the tox 3.x syntax.
 minversion = 4.4.3
-# This version of virtualenv will install setuptools version 65.5.0 and pip
-# 22.3. These versions fully support python projects defined only through a
-# pyproject.toml file (PEP-517/PEP-518/PEP-621)
-requires = virtualenv>=20.16.6
+# This version of virtualenv will install setuptools version 68.2.2 and pip
+# 23.3.1. These versions fully support python projects defined only through a
+# pyproject.toml file (PEP-517/PEP-518/PEP-621). This pip version also support
+# the proper version resolving with (sub-)dependencies defining dev extra's.
+requires = virtualenv>=20.24.6
 
 [testenv]
 deps =