dissect.cstruct 4.8.dev4__py3-none-any.whl → 4.8.dev5__py3-none-any.whl

dissect/cstruct/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.cstruct.bitbuffer import BitBuffer
 from dissect.cstruct.cstruct import cstruct, ctypes, ctypes_type
 from dissect.cstruct.exceptions import (

dissect/cstruct/compiler.py

@@ -11,7 +11,6 @@ from typing import TYPE_CHECKING
 from dissect.cstruct.bitbuffer import BitBuffer
 from dissect.cstruct.types import (
     Array,
-    BaseType,
     Char,
     CharArray,
     Flag,
@@ -34,6 +33,9 @@ if TYPE_CHECKING:
     from types import MethodType
 
     from dissect.cstruct.cstruct import cstruct
+    from dissect.cstruct.types import (
+        BaseType,
+    )
     from dissect.cstruct.types.structure import Field
 
 SUPPORTED_TYPES = (

dissect/cstruct/cstruct.py

@@ -12,12 +12,10 @@ from dissect.cstruct.expression import Expression
 from dissect.cstruct.parser import CStyleParser, TokenParser
 from dissect.cstruct.types import (
     LEB128,
-    Array,
     BaseArray,
     BaseType,
     Char,
     Enum,
-    Field,
     Flag,
     Int,
     Packed,
@@ -32,6 +30,11 @@ if TYPE_CHECKING:
     from collections.abc import Iterable
     from typing import TypeAlias
 
+    from dissect.cstruct.types import (
+        Array,
+        Field,
+    )
+
 
 T = TypeVar("T", bound=BaseType)
 

dissect/cstruct/exceptions.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class Error(Exception):
     pass
 

dissect/cstruct/expression.py

@@ -225,7 +225,6 @@ class Expression:
 
     def evaluate(self, cs: cstruct, context: dict[str, int] | None = None) -> int:
         """Evaluates an expression using a Shunting-Yard implementation."""
-
         self.stack = []
         self.queue = []
         operators = set(self.binary_operators.keys()) | set(self.unary_operators.keys())

dissect/cstruct/parser.py

@@ -11,10 +11,11 @@ from dissect.cstruct.exceptions import (
     ParserError,
 )
 from dissect.cstruct.expression import Expression
-from dissect.cstruct.types import BaseArray, BaseType, Field, Structure
+from dissect.cstruct.types import BaseArray, Field, Structure
 
 if TYPE_CHECKING:
     from dissect.cstruct import cstruct
+    from dissect.cstruct.types import BaseType
 
 
 class Parser:
@@ -37,7 +38,8 @@ class Parser:
 
 
 class TokenParser(Parser):
-    """
+    """Definition parser for C-like structure syntax.
+
     Args:
         cs: An instance of cstruct.
         compiled: Whether structs should be compiled or not.
@@ -421,8 +423,7 @@ class TokenParser(Parser):
 
     @staticmethod
     def _lineno(tok: Token) -> int:
-        """Quick and dirty line number calculator"""
-
+        """Quick and dirty line number calculator."""
         match = tok.match
         return match.string.count("\n", 0, match.start()) + 1
 
@@ -474,7 +475,7 @@ class TokenParser(Parser):
 
 
 class CStyleParser(Parser):
-    """Definition parser for C-like structure syntax.
+    """Definition parser for C-like structure syntax (legacy parser).
 
     Args:
         cs: An instance of cstruct

dissect/cstruct/types/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.cstruct.types.base import Array, BaseArray, BaseType, MetaType
 from dissect.cstruct.types.char import Char, CharArray
 from dissect.cstruct.types.enum import Enum

dissect/cstruct/types/enum.py

@@ -5,12 +5,13 @@ from enum import Enum as _Enum
 from enum import EnumMeta, IntEnum, IntFlag
 from typing import TYPE_CHECKING, Any, BinaryIO, TypeVar, overload
 
-from dissect.cstruct.types.base import Array, BaseType, MetaType
+from dissect.cstruct.types.base import BaseType, MetaType
 
 if TYPE_CHECKING:
     from typing_extensions import Self
 
     from dissect.cstruct.cstruct import cstruct
+    from dissect.cstruct.types.base import Array
 
 
 PY_311 = sys.version_info >= (3, 11, 0)

dissect/cstruct/types/structure.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import io
 from collections import ChainMap
-from collections.abc import Callable, MutableMapping
+from collections.abc import MutableMapping
 from contextlib import contextmanager
 from enum import Enum
 from functools import lru_cache
@@ -23,7 +23,7 @@ from dissect.cstruct.types.enum import EnumMetaType
 from dissect.cstruct.types.pointer import Pointer
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator, Mapping
+    from collections.abc import Callable, Iterator, Mapping
     from types import FunctionType
 
     from typing_extensions import Self
@@ -139,7 +139,7 @@ class StructureMetaType(MetaType):
 
         if cls.__compiled__:
             # If the previous class was compiled try to compile this too
-            from dissect.cstruct import compiler  # noqa: PLC0415
+            from dissect.cstruct import compiler
 
             try:
                 classdict["_read"] = compiler.Compiler(cls.cs).compile_read(fields, cls.__name__, align=cls.__align__)

{dissect_cstruct-4.8.dev4.dist-info → dissect_cstruct-4.8.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.cstruct
-Version: 4.8.dev4
+Version: 4.8.dev5
 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-Expression: Apache-2.0

{dissect_cstruct-4.8.dev4.dist-info → dissect_cstruct-4.8.dev5.dist-info}/RECORD

@@ -1,29 +1,29 @@
-dissect/cstruct/__init__.py,sha256=mILXFvtajLG5EqAPSeCJ2g5klZSnRbu7uqyGcH_DF2k,1344
+dissect/cstruct/__init__.py,sha256=Z47dU_PpbZyc2ZSyu-ww-ncX6igaTw0ItVHzVgiaiKI,1380
 dissect/cstruct/bitbuffer.py,sha256=bid_N4ZsaTeC3x5Fzs8viUrldT863dMPtEDih20Nt6k,2644
-dissect/cstruct/compiler.py,sha256=WqkO23EE_iOpVuV7FqCFPX0Q0Mcfk0oyPacV-aCGKpk,14153
-dissect/cstruct/cstruct.py,sha256=_wCqhIHNAldWDQWlhQfXES4LB7AYKZVjYUGnnraqtRc,19428
-dissect/cstruct/exceptions.py,sha256=WqsUW4OiIpRLQLvixfLrfKl0rtvU1qx7pvfBrz9Sz-I,293
-dissect/cstruct/expression.py,sha256=dHpwiVQyclKZ3IAajpG7UsvX1vmBI2zrJqr-J1CMt-I,10842
-dissect/cstruct/parser.py,sha256=wqCybNPtu7fbA6ex-lfmv8KqbNaq8JfLUzwl4c5bkYc,24450
+dissect/cstruct/compiler.py,sha256=uOjteLdoUIVNSX71TsBAusW8U085RRH9dXkbK3dp1vY,14203
+dissect/cstruct/cstruct.py,sha256=1lHbxZwj5x2EmmXLR0sJlp-wQqaTtd_ht1lvwit0KtQ,19483
+dissect/cstruct/exceptions.py,sha256=SX05-_HqQn8lYC7SBHv5OrYEepYRMNmRiIzVPW8bvMQ,330
+dissect/cstruct/expression.py,sha256=mf5GFGLAn_2Tz3QK86Yqoi317l8cjMcffBKzP2STE6M,10841
+dissect/cstruct/parser.py,sha256=Mk8QbkDov_xfauZnp2MqUmFGOPZlp7O2rSLYbB9S3g4,24550
 dissect/cstruct/utils.py,sha256=6cU1QHTZnHXQaPoxMH93ELkwIIUgYw-TtxieEcVvYvw,10537
 dissect/cstruct/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/cstruct/tools/stubgen.py,sha256=wvl07h3VnJZWe9ygX4QMxjEH1ZcWaI_6_pSdAJoOEXk,7820
-dissect/cstruct/types/__init__.py,sha256=B-qMAi6v8PZHdPnpODVQAoldJqUIbh9O_UBwh7mL8qY,875
+dissect/cstruct/types/__init__.py,sha256=6P71Pu94Dv7RNjZpDZ19pqzx-G0QzmQw4q0-3zWALso,911
 dissect/cstruct/types/base.py,sha256=-NYmoX4vEfaFsnAIwQ0nZCz8X2qKEomgpnef2jB4klQ,9708
 dissect/cstruct/types/char.py,sha256=9XYCjCF0D_5o3EYnmIcjev-5GI2NzxOhd1ct1xF6SAM,2457
-dissect/cstruct/types/enum.py,sha256=uSAayOYfEwfDZrl1tFGZteFceqdTbW_2GTtDyzuiG3M,7523
+dissect/cstruct/types/enum.py,sha256=vOsD99P7VLhj6vcH_ow1jmyipLP63FmqUQ9GLZ1L8Pc,7565
 dissect/cstruct/types/flag.py,sha256=7xxQjFEDPHSQOxBHgcc75WzPiAxflOquwr7Z7c3erLE,2347
 dissect/cstruct/types/int.py,sha256=MGsdUxJt-lj3nl9wzAgGX8cb_vJOtGLiCHwYZs1j_IA,1156
 dissect/cstruct/types/leb128.py,sha256=kDmsWGXX6vr1bm4uJcilsrQ7JABdQRio16rBZV21pno,2243
 dissect/cstruct/types/packed.py,sha256=tpZpb8tiSMXr1np6p0-nZqT4sY7zieO-4E16lmMmqJA,2128
 dissect/cstruct/types/pointer.py,sha256=PqeJOoNBUfMd5uO2kpF6OHeW7Q6R1N1W1V4q1MakN4I,3912
-dissect/cstruct/types/structure.py,sha256=FQv6x-vXm6h27FaqRBW7JKYVwtKMCg4jI4ZDIbYKEwo,33029
+dissect/cstruct/types/structure.py,sha256=I9LVeZ81rNE5GDT6wxpUL-PqMO31Ae6TVLLzTGyd6mM,33012
 dissect/cstruct/types/void.py,sha256=Gvh0HqI6jQSj2uesdo3J8-G41brWCz8pmP16l8xTBxE,1074
 dissect/cstruct/types/wchar.py,sha256=N9Y_XX2_hZEe2DwepJjxsB6xuRJ6zINRalcUofR59kY,2608
-dissect_cstruct-4.8.dev4.dist-info/licenses/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
-dissect_cstruct-4.8.dev4.dist-info/licenses/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
-dissect_cstruct-4.8.dev4.dist-info/METADATA,sha256=FzjujlDF19JNZjyuisVFAdif7IVKu0HJfJ3aUyNeP0I,9255
-dissect_cstruct-4.8.dev4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-dissect_cstruct-4.8.dev4.dist-info/entry_points.txt,sha256=z53zqZqwD2OLrAkRwrP4wTeiU9CQe7xrMly0T2c0_wQ,71
-dissect_cstruct-4.8.dev4.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect_cstruct-4.8.dev4.dist-info/RECORD,,
+dissect_cstruct-4.8.dev5.dist-info/licenses/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
+dissect_cstruct-4.8.dev5.dist-info/licenses/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
+dissect_cstruct-4.8.dev5.dist-info/METADATA,sha256=OgahqdcaXxySN7jBort-kTeB45TFVQqdefYl68Wi9T8,9255
+dissect_cstruct-4.8.dev5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+dissect_cstruct-4.8.dev5.dist-info/entry_points.txt,sha256=z53zqZqwD2OLrAkRwrP4wTeiU9CQe7xrMly0T2c0_wQ,71
+dissect_cstruct-4.8.dev5.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect_cstruct-4.8.dev5.dist-info/RECORD,,