Compatibility with cstruct v4

dissect/vmfs/c_vmfs.py

@@ -1,7 +1,7 @@
 import stat
 import struct
 
-from dissect import cstruct
+from dissect.cstruct import cstruct
 
 vmfs_def = """
 /* === System file addresses === */
@@ -368,8 +368,7 @@
 };
 """
 
-c_vmfs = cstruct.cstruct()
-c_vmfs.load(vmfs_def)
+c_vmfs = cstruct().load(vmfs_def)
 
 ADDRESS_TYPE_MASK = 7
 ResourceType = c_vmfs.ResourceType

dissect/vmfs/resource.py

@@ -217,8 +217,7 @@ def open(self, resource_type, address=None, fileobj=None):
  return None
 
  def _get_resource_for_resource_type(self, resource_type):
- if not isinstance(resource_type, int):
- resource_type = resource_type.value
+ resource_type = int(resource_type)
 
  if resource_type not in self.resources:
  raise ValueError(f"No resource opened for type {ResourceType(resource_type)}")

pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
  "Topic :: Utilities",
 ]
 dependencies = [
- "dissect.cstruct>=3.0.dev,<4.0.dev",
- "dissect.util>=3.0.dev,<4.0.dev",
+ "dissect.cstruct>=4.dev,<5",
+ "dissect.util>=3,<4",
 ]
 dynamic = ["version"]
 
@@ -35,6 +35,12 @@ homepage = "https://dissect.tools"
 documentation = "https://docs.dissect.tools/en/latest/projects/dissect.vmfs"
 repository = "https://github.com/fox-it/dissect.vmfs"
 
+[project.optional-dependencies]
+dev = [
+ "dissect.cstruct>=4.0.dev,<5.0.dev",
+ "dissect.util>=3.0.dev,<4.0.dev",
+]
+
 [tool.black]
 line-length = 120
 

tox.ini

@@ -11,6 +11,7 @@ minversion = 4.4.3
 requires = virtualenv>=20.16.6
 
 [testenv]
+extras = dev
 deps =
  pytest
  pytest-cov