Add isort to flake8 linting (#14)

(DIS-1789)

dissect/hypervisor/__init__.py

@@ -1,9 +1,8 @@
 from dissect.hypervisor.backup import vma, wim, xva
+from dissect.hypervisor.descriptor import hyperv, ovf, vbox, vmx
 from dissect.hypervisor.disk import qcow2, vdi, vhd, vhdx, vmdk
-from dissect.hypervisor.descriptor import hyperv, ovf, vmx, vbox
 from dissect.hypervisor.util import envelope, vmtar
 
-
 __all__ = [
     "envelope",
     "hyperv",

dissect/hypervisor/backup/c_vma.py

@@ -1,6 +1,5 @@
 from dissect import cstruct
 
-
 vma_def = """
 #define VMA_BLOCK_BITS          12
 #define VMA_BLOCK_SIZE          (1 << VMA_BLOCK_BITS)

dissect/hypervisor/backup/c_wim.py

@@ -1,6 +1,5 @@
 from dissect import cstruct
 
-
 wim_def = """
 typedef char[16] GUID;
 typedef uint64 LARGE_INTEGER;

dissect/hypervisor/backup/vma.py

@@ -11,7 +11,7 @@
 from dissect.util import ts
 from dissect.util.stream import AlignedStream
 
-from dissect.hypervisor.backup.c_vma import c_vma, VMA_MAGIC, VMA_EXTENT_MAGIC
+from dissect.hypervisor.backup.c_vma import VMA_EXTENT_MAGIC, VMA_MAGIC, c_vma
 from dissect.hypervisor.exceptions import InvalidHeaderError
 
 

dissect/hypervisor/backup/wim.py

@@ -1,4 +1,4 @@
-from dissect.hypervisor.backup.c_wim import c_wim, WIM_IMAGE_TAG
+from dissect.hypervisor.backup.c_wim import WIM_IMAGE_TAG, c_wim
 from dissect.hypervisor.exceptions import InvalidHeaderError
 
 

dissect/hypervisor/descriptor/c_hyperv.py

@@ -1,6 +1,5 @@
 from dissect import cstruct
 
-
 hyperv_def = """
 /* ======== File header ======== */
 

dissect/hypervisor/descriptor/hyperv.py

@@ -5,7 +5,12 @@
 
 from dissect.util.stream import RangeStream
 
-from dissect.hypervisor.descriptor.c_hyperv import KeyDataFlag, KeyDataType, ObjectEntryType, c_hyperv
+from dissect.hypervisor.descriptor.c_hyperv import (
+    KeyDataFlag,
+    KeyDataType,
+    ObjectEntryType,
+    c_hyperv,
+)
 from dissect.hypervisor.exceptions import InvalidSignature
 
 

dissect/hypervisor/descriptor/vmx.py

@@ -10,7 +10,6 @@
 from typing import Dict, List
 from urllib.parse import unquote
 
-
 try:
     import _pystandalone
 

dissect/hypervisor/disk/c_qcow2.py

@@ -1,6 +1,5 @@
 from dissect import cstruct
 
-
 qcow2_def = """
 #define MIN_CLUSTER_BITS 9
 #define MAX_CLUSTER_BITS 21

dissect/hypervisor/disk/c_vdi.py

@@ -1,6 +1,5 @@
 from dissect import cstruct
 
-
 # https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Storage/VDICore.h
 # https://forums.virtualbox.org/viewtopic.php?t=8046
 # 0000      3C 3C 3C 20 53 75 6E 20 78 56 4D 20 56 69 72 74    <<< Sun xVM Virt

dissect/hypervisor/disk/c_vhd.py

@@ -1,6 +1,5 @@
 from dissect import cstruct
 
-
 vhd_def = """
 struct footer {
     char            cookie[8];

dissect/hypervisor/disk/c_vhdx.py

@@ -2,7 +2,6 @@
 
 from dissect import cstruct
 
-
 vhdx_def = """
 #define PAYLOAD_BLOCK_NOT_PRESENT           0
 #define PAYLOAD_BLOCK_UNDEFINED             1

dissect/hypervisor/disk/c_vmdk.py

@@ -1,6 +1,6 @@
 import struct
-from dissect import cstruct
 
+from dissect import cstruct
 
 vmdk_def = """
 typedef struct {

dissect/hypervisor/tools/vma.py

@@ -3,12 +3,19 @@
 import sys
 from pathlib import Path
 
-from dissect.hypervisor.backup.vma import VMA, _iter_mask
 from dissect.hypervisor.backup.c_vma import c_vma
+from dissect.hypervisor.backup.vma import VMA, _iter_mask
 
 try:
     from rich.logging import RichHandler
-    from rich.progress import BarColumn, DownloadColumn, Progress, TextColumn, TimeRemainingColumn, TransferSpeedColumn
+    from rich.progress import (
+        BarColumn,
+        DownloadColumn,
+        Progress,
+        TextColumn,
+        TimeRemainingColumn,
+        TransferSpeedColumn,
+    )
 
     progress = Progress(
         TextColumn("[bold blue]{task.fields[filename]}", justify="right"),

dissect/hypervisor/util/envelope.py

@@ -28,7 +28,6 @@
 from dissect import cstruct
 from dissect.util.stream import RangeStream
 
-
 c_def = """
 struct EnvelopeFileHeader {
     char    magic[21];

setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 setup(
     name="dissect.hypervisor",

tests/conftest.py

@@ -1,5 +1,5 @@
-import os
 import gzip
+import os
 
 import pytest
 

tests/test_envelope.py

@@ -2,7 +2,12 @@
 
 import pytest
 
-from dissect.hypervisor.util.envelope import Envelope, KeyStore, HAS_PYCRYPTODOME, HAS_PYSTANDALONE
+from dissect.hypervisor.util.envelope import (
+    HAS_PYCRYPTODOME,
+    HAS_PYSTANDALONE,
+    Envelope,
+    KeyStore,
+)
 
 
 def test_envelope_keystore(keystore):

tests/test_vhd.py

@@ -1,4 +1,4 @@
-from dissect.hypervisor.disk.vhd import VHD, FixedDisk, DynamicDisk
+from dissect.hypervisor.disk.vhd import VHD, DynamicDisk, FixedDisk
 
 
 def test_vhd_fixed(fixed_vhd):

tests/test_vhdx.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from dissect.hypervisor.disk.vhdx import VHDX, c_vhdx, _iter_partial_runs
+from dissect.hypervisor.disk.vhdx import VHDX, _iter_partial_runs, c_vhdx
 
 
 def test_vhdx_fixed(fixed_vhdx):

tests/test_vmdk.py

@@ -1,5 +1,5 @@
-from dissect.hypervisor.disk.vmdk import VMDK
 from dissect.hypervisor.disk.c_vmdk import c_vmdk
+from dissect.hypervisor.disk.vmdk import VMDK
 
 
 def test_vmdk_sesparse(sesparse_vmdk):

tests/test_vmx.py

@@ -1,6 +1,6 @@
 import pytest
 
-from dissect.hypervisor.descriptor.vmx import VMX, HAS_PYCRYPTODOME, HAS_PYSTANDALONE
+from dissect.hypervisor.descriptor.vmx import HAS_PYCRYPTODOME, HAS_PYSTANDALONE, VMX
 
 
 def test_vmx():

tox.ini

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