Add isort to flake8 linting

dissect/cim/__init__.py

@@ -1,6 +1,10 @@
 from dissect.cim.cim import CIM
-from dissect.cim.exceptions import Error, InvalidDatabaseError, ReferenceNotFoundError, UnmappedPageError
-
+from dissect.cim.exceptions import (
+    Error,
+    InvalidDatabaseError,
+    ReferenceNotFoundError,
+    UnmappedPageError,
+)
 
 __all__ = [
     "CIM",

dissect/cim/c_cim.py

@@ -2,7 +2,6 @@
 
 from dissect import cstruct
 
-
 cim_def = """
 // Mapping
 

dissect/cim/cim.py

@@ -6,16 +6,19 @@
 import os
 from io import BytesIO
 
-from dissect.cim.c_cim import c_cim, ARRAY_STATES, NAMESPACE_CLASS_NAME, ROOT_NAMESPACE_NAME, SYSTEM_NAMESPACE_NAME
+from dissect.cim.c_cim import (
+    ARRAY_STATES,
+    NAMESPACE_CLASS_NAME,
+    ROOT_NAMESPACE_NAME,
+    SYSTEM_NAMESPACE_NAME,
+    c_cim,
+)
 from dissect.cim.classes import ClassDefinition, ClassInstance, PropertyDefaultValues
-from dissect.cim.exceptions import InvalidDatabaseError, Error
+from dissect.cim.exceptions import Error, InvalidDatabaseError
 from dissect.cim.index import Index, Key
 from dissect.cim.mappings import Mapping
 from dissect.cim.objects import Objects
-from dissect.cim.utils import (
-    find_current_mapping,
-    parse_object_path,
-)
+from dissect.cim.utils import find_current_mapping, parse_object_path
 
 
 class CIM:

dissect/cim/classes.py

@@ -3,7 +3,6 @@
 from dissect.util.ts import wintimestamp
 
 from dissect.cim.c_cim import (
-    c_cim,
     ARRAY_STATES,
     BOOLEAN_STATES,
     BUILTIN_PROPERTIES,
@@ -13,6 +12,7 @@
     DYNPROPS_STATES,
     ClassDefinitionPropertyState,
     ClassInstancePropertyState,
+    c_cim,
 )
 from dissect.cim.exceptions import Error
 

dissect/cim/index.py

@@ -3,7 +3,12 @@
 from functools import lru_cache, partial
 from io import BytesIO
 
-from dissect.cim.c_cim import c_cim, INDEX_PAGE_INVALID, INDEX_PAGE_INVALID2, INDEX_PAGE_SIZE
+from dissect.cim.c_cim import (
+    INDEX_PAGE_INVALID,
+    INDEX_PAGE_INVALID2,
+    INDEX_PAGE_SIZE,
+    c_cim,
+)
 from dissect.cim.exceptions import ReferenceNotFoundError
 
 

dissect/cim/objects.py

@@ -1,6 +1,6 @@
 from io import BytesIO
 
-from dissect.cim.c_cim import c_cim, DATA_PAGE_SIZE
+from dissect.cim.c_cim import DATA_PAGE_SIZE, c_cim
 from dissect.cim.exceptions import Error
 
 

dissect/cim/utils.py

@@ -3,7 +3,6 @@
 from dissect.cim.c_cim import c_cim
 from dissect.cim.exceptions import Error
 
-
 ObjectPath = namedtuple("ObjectPath", ["hostname", "namespace", "class_", "instance"])
 
 

tox.ini

@@ -39,6 +39,7 @@ deps =
     black==23.1.0
     flake8
     flake8-black
+    flake8-isort
     vermin
 commands =
     flake8 dissect tests setup.py