Add isort to flake8 linting (#26)

(DIS-1789)

dissect/cstruct/__init__.py

@@ -1,51 +1,43 @@
+from dissect.cstruct.bitbuffer import BitBuffer
 from dissect.cstruct.compiler import Compiler
+from dissect.cstruct.cstruct import cstruct, ctypes, ctypes_type
+from dissect.cstruct.exceptions import (
+    Error,
+    NullPointerDereference,
+    ParserError,
+    ResolveError,
+)
 from dissect.cstruct.expression import Expression
 from dissect.cstruct.types.base import Array, BaseType, RawType
+from dissect.cstruct.types.bytesinteger import BytesInteger
 from dissect.cstruct.types.chartype import CharType
+from dissect.cstruct.types.enum import Enum, EnumInstance
+from dissect.cstruct.types.flag import Flag, FlagInstance
 from dissect.cstruct.types.instance import Instance
-from dissect.cstruct.types.structure import Structure, Field, Union
-from dissect.cstruct.types.voidtype import VoidType
-from dissect.cstruct.types.wchartype import WcharType
 from dissect.cstruct.types.packedtype import PackedType
-from dissect.cstruct.types.flag import Flag, FlagInstance
-from dissect.cstruct.types.enum import Enum, EnumInstance
-from dissect.cstruct.types.bytesinteger import BytesInteger
 from dissect.cstruct.types.pointer import Pointer, PointerInstance
-
-from dissect.cstruct.exceptions import (
-    Error,
-    ParserError,
-    ResolveError,
-    NullPointerDereference,
-)
-
-from dissect.cstruct.cstruct import (
-    cstruct,
-    ctypes,
-    ctypes_type,
-)
-
+from dissect.cstruct.types.structure import Field, Structure, Union
+from dissect.cstruct.types.voidtype import VoidType
+from dissect.cstruct.types.wchartype import WcharType
 from dissect.cstruct.utils import (
     dumpstruct,
     hexdump,
-    pack,
     p8,
     p16,
     p32,
     p64,
+    pack,
     swap,
     swap16,
     swap32,
     swap64,
-    unpack,
     u8,
     u16,
     u32,
     u64,
+    unpack,
 )
 
-from dissect.cstruct.bitbuffer import BitBuffer
-
 __all__ = [
     "Compiler",
     "Array",

dissect/cstruct/bitbuffer.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import BinaryIO, TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, BinaryIO, Union
 
 if TYPE_CHECKING:
     from dissect.cstruct.types import RawType

dissect/cstruct/cstruct.py

@@ -11,9 +11,9 @@
     BaseType,
     BytesInteger,
     CharType,
-    Structure,
     PackedType,
     Pointer,
+    Structure,
     VoidType,
     WcharType,
 )

dissect/cstruct/types/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from io import BytesIO
-from typing import Any, BinaryIO, List, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, BinaryIO, List
 
 from dissect.cstruct.exceptions import ArraySizeError
 from dissect.cstruct.expression import Expression

dissect/cstruct/types/chartype.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, BinaryIO, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, BinaryIO
 
 from dissect.cstruct.types import RawType
 

dissect/cstruct/types/enum.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, BinaryIO, Dict, List, Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, BinaryIO, Dict, List, Union
 
 from dissect.cstruct.types import BaseType, RawType
 

dissect/cstruct/types/packedtype.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import struct
-from typing import Any, BinaryIO, List, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, BinaryIO, List
 
 from dissect.cstruct.types import RawType
 

dissect/cstruct/types/pointer.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import operator
-from typing import Any, BinaryIO, Callable, Dict, Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, BinaryIO, Callable, Dict, Union
 
 from dissect.cstruct.exceptions import NullPointerDereference
 from dissect.cstruct.types import BaseType, CharType, RawType

dissect/cstruct/types/structure.py

@@ -2,7 +2,7 @@
 
 import io
 from collections import OrderedDict
-from typing import Any, BinaryIO, List, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, BinaryIO, List
 
 from dissect.cstruct.bitbuffer import BitBuffer
 from dissect.cstruct.types import BaseType, Enum, Instance

dissect/cstruct/utils.py

@@ -1,5 +1,5 @@
-import string
 import pprint
+import string
 from typing import List, Tuple
 
 from dissect.cstruct.types import Instance, Structure

tests/test_bitbuffer.py

@@ -1,8 +1,8 @@
 from io import BytesIO
 
 import pytest
-
 from dissect import cstruct
+
 from dissect.cstruct.bitbuffer import BitBuffer
 
 

tests/test_bitfield.py

@@ -1,5 +1,4 @@
 import pytest
-
 from dissect import cstruct
 
 from .utils import verify_compiled

tests/test_bytesinteger.py

@@ -1,6 +1,6 @@
 import pytest
-
 from dissect import cstruct
+
 from dissect.cstruct.types import BytesInteger
 
 from .utils import verify_compiled

tests/test_ctypes_type.py

@@ -1,9 +1,8 @@
-import pytest
 import ctypes as _ctypes
 
+import pytest
 from dissect import cstruct
 
-
 DUMMY_CSTRUCT = cstruct.cstruct()
 PACKED_TYPE_INT8 = cstruct.PackedType(DUMMY_CSTRUCT, "int8", 1, "b")
 

tests/test_enum.py

@@ -1,5 +1,4 @@
 import pytest
-
 from dissect import cstruct
 
 from .utils import verify_compiled

tests/test_expression.py

@@ -1,8 +1,7 @@
 import pytest
-
 from dissect import cstruct
-from dissect.cstruct.expression import Expression
 
+from dissect.cstruct.expression import Expression
 
 testdata = [
     ("1 * 0", 0),

tests/test_packedtype.py

@@ -1,6 +1,6 @@
 import pytest
-
 from dissect import cstruct
+
 from dissect.cstruct.types import PackedType
 
 from .utils import verify_compiled

tests/test_pointer.py

@@ -1,6 +1,6 @@
 import pytest
-
 from dissect import cstruct
+
 from dissect.cstruct.types.pointer import PointerInstance
 
 from .utils import verify_compiled

tests/test_struct.py

@@ -1,7 +1,6 @@
 from io import BytesIO
 
 import pytest
-
 from dissect import cstruct
 
 from .utils import verify_compiled

tests/test_util.py

@@ -1,6 +1,6 @@
 import pytest
-
 from dissect import cstruct
+
 from dissect.cstruct.utils import dumpstruct, hexdump
 
 from .utils import verify_compiled

tox.ini

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