dissect.cim 3.11.dev3__tar.gz → 3.12.dev1__tar.gz

{dissect_cim-3.11.dev3 → dissect_cim-3.12.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.cim
-Version: 3.11.dev3
+Version: 3.12.dev1
 Summary: A Dissect module implementing a parser for the Windows Common Information Model (CIM) database, used in the Windows operating system
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -27,6 +27,7 @@ Requires-Dist: dissect.util<4,>=3
 Provides-Extra: dev
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.cim
 

{dissect_cim-3.11.dev3 → dissect_cim-3.12.dev1}/dissect/cim/cim.py

@@ -22,6 +22,7 @@ from dissect.cim.classes import (
     ClassDefinition,
     ClassDefinitionProperty,
     ClassInstance,
+    ClassInstanceProperty,
     InstanceKey,
     PropertyDefaultValues,
     Qualifier,
@@ -302,12 +303,6 @@ class Instance:
         self.class_definition = class_.class_definition
         self.class_instance = class_instance
 
-    def __getattr__(self, attr: str) -> Any:
-        try:
-            return getattr(self.class_instance, attr)
-        except AttributeError:
-            return object.__getattribute__(self, attr)
-
     @property
     def key(self) -> InstanceKey:
         return self.class_instance.key
@@ -328,6 +323,10 @@ class Instance:
     def ci(self) -> ClassInstance:
         return self.class_instance
 
+    @property
+    def properties(self) -> dict[str, ClassInstanceProperty]:
+        return self.class_instance.properties
+
 
 class Property:
     def __init__(self, class_: Class, prop: ClassDefinitionProperty):

{dissect_cim-3.11.dev3 → dissect_cim-3.12.dev1}/dissect/cim/classes.py

@@ -424,6 +424,18 @@ class DataRegion:
         if t in (CIM_TYPES.STRING, CIM_TYPES.REFERENCE, CIM_TYPES.DATETIME):
             return self.get_string(value)
 
+        if t in (
+            CIM_TYPES.INT8,
+            CIM_TYPES.UINT8,
+            CIM_TYPES.INT16,
+            CIM_TYPES.UINT16,
+            CIM_TYPES.INT32,
+            CIM_TYPES.UINT32,
+            CIM_TYPES.INT64,
+            CIM_TYPES.UINT64,
+        ):
+            return value
+
         if t == CIM_TYPES.BOOLEAN:
             return value == BOOLEAN_STATES.TRUE
 

{dissect_cim-3.11.dev3 → dissect_cim-3.12.dev1}/dissect.cim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.cim
-Version: 3.11.dev3
+Version: 3.12.dev1
 Summary: A Dissect module implementing a parser for the Windows Common Information Model (CIM) database, used in the Windows operating system
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -27,6 +27,7 @@ Requires-Dist: dissect.util<4,>=3
 Provides-Extra: dev
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.cim
 

dissect_cim-3.12.dev1/tests/test_cim.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from typing import BinaryIO
+
+from dissect.cim.cim import CIM
+
+
+def test_cim(index_bin: BinaryIO, objects_bin: BinaryIO, mappings_bin: list[BinaryIO]) -> None:
+    repo = CIM(index_bin, objects_bin, mappings_bin)
+    assert repo
+
+    subscription_ns = repo.root.namespace("subscription")
+    binding = next(subscription_ns.class_("__filtertoconsumerbinding").instances)
+    consumer = subscription_ns.query(binding.properties["Consumer"].value)
+    assert consumer.properties["SourceName"].value == "Service Control Manager"

dissect_cim-3.11.dev3/tests/test_cim.py

@@ -1,10 +0,0 @@
-from __future__ import annotations
-
-from typing import BinaryIO
-
-from dissect.cim.cim import CIM
-
-
-def test_cim(index_bin: BinaryIO, objects_bin: BinaryIO, mappings_bin: list[BinaryIO]) -> None:
-    repo = CIM(index_bin, objects_bin, mappings_bin)
-    assert repo