Add isort to flake8 linting (fox-it#164)

(DIS-1789)

dissect/target/containers/asdf.py

@@ -4,6 +4,7 @@
 
 from dissect.evidence import AsdfSnapshot, AsdfStream
 from dissect.evidence.asdf import FILE_MAGIC
+
 from dissect.target.container import Container
 
 

dissect/target/containers/qcow2.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import BinaryIO, Union
 
-from dissect.hypervisor.disk import qcow2, c_qcow2
+from dissect.hypervisor.disk import c_qcow2, qcow2
 
 from dissect.target.container import Container
 

dissect/target/containers/raw.py

@@ -2,9 +2,10 @@
 from pathlib import Path
 from typing import BinaryIO, Union
 
-from dissect.target.container import Container
 from dissect.util.stream import AlignedStream, BufferedStream
 
+from dissect.target.container import Container
+
 
 class RawContainer(Container):
     def __init__(self, fh: Union[BinaryIO, Path], *args, **kwargs):

dissect/target/helpers/docs.py

@@ -1,9 +1,7 @@
 import inspect
 import itertools
 import textwrap
-
-from typing import Callable, Tuple, Type, Any
-
+from typing import Any, Callable, Tuple, Type
 
 NO_DOCS = "No documentation"
 

dissect/target/helpers/keychain.py

@@ -2,8 +2,7 @@
 import logging
 from enum import Enum
 from pathlib import Path
-from typing import Set, NamedTuple, List
-
+from typing import List, NamedTuple, Set
 
 log = logging.getLogger(__name__)
 

dissect/target/helpers/loaderutil.py

@@ -1,9 +1,8 @@
 import re
 import urllib
-
-from typing import Optional, Tuple, Union
-from pathlib import Path
 from os import PathLike
+from pathlib import Path
+from typing import Optional, Tuple, Union
 
 from dissect.target.exceptions import FileNotFoundError
 from dissect.target.filesystems.ntfs import NtfsFilesystem

dissect/target/loader.py

@@ -2,7 +2,6 @@
 
 import logging
 import urllib
-
 from pathlib import Path
 from typing import TYPE_CHECKING, Iterator, Optional, Union
 

dissect/target/loaders/ad1.py

@@ -1,4 +1,5 @@
 from dissect.evidence import ad1
+
 from dissect.target import filesystem
 from dissect.target.loader import Loader
 

dissect/target/loaders/asdf.py

@@ -1,4 +1,5 @@
 from dissect.evidence import AsdfSnapshot
+
 from dissect.target.containers.asdf import AsdfContainer
 from dissect.target.helpers import fsutil
 from dissect.target.loader import Loader

dissect/target/loaders/cb.py

@@ -2,6 +2,7 @@
 
 from cbapi.live_response_api import LiveResponseError
 from cbapi.response import CbResponseAPI, Sensor
+
 from dissect.target.exceptions import (
     RegistryKeyNotFoundError,
     RegistryValueNotFoundError,

dissect/target/loaders/dir.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import List, Tuple, TYPE_CHECKING
+from typing import TYPE_CHECKING, List, Tuple
 
 from dissect.target.filesystems.dir import DirectoryFilesystem
 from dissect.target.helpers import loaderutil

dissect/target/loaders/itunes.py

@@ -5,13 +5,12 @@
 
 from dissect.sql import sqlite3
 from dissect.util.plist import NSKeyedArchiver
-from dissect.target.exceptions import LoaderError
 
+from dissect.target.exceptions import LoaderError
 from dissect.target.filesystems.itunes import ITunesFilesystem
 from dissect.target.helpers import fsutil, keychain
 from dissect.target.loader import Loader
 
-
 try:
     import _pystandalone
 

dissect/target/loaders/ovf.py

@@ -1,4 +1,5 @@
 from dissect.hypervisor import ovf
+
 from dissect.target.containers.vmdk import VmdkContainer
 from dissect.target.loader import Loader
 

dissect/target/loaders/phobos.py

@@ -1,6 +1,7 @@
+from dissect.util import stream
+
 from dissect.target import filesystem
 from dissect.target.loader import Loader
-from dissect.util import stream
 
 BLOCK_SIZE = 64 * 0x100000  # 64 MiB
 

dissect/target/loaders/remote.py

@@ -5,7 +5,6 @@
 import ssl
 import time
 import urllib
-
 from io import DEFAULT_BUFFER_SIZE
 from pathlib import Path
 from struct import pack, unpack
@@ -18,7 +17,6 @@
 from dissect.target.loader import Loader
 from dissect.target.target import Target
 
-
 log = logging.getLogger(__name__)
 
 

dissect/target/loaders/res.py

@@ -5,13 +5,13 @@
 import zlib
 
 import defusedxml.ElementTree as ET
+from dissect.util import ts
 
 from dissect.target import filesystem
 from dissect.target.helpers import fsutil, record, regutil
 from dissect.target.loader import Loader
 from dissect.target.plugin import OSPlugin, export
 from dissect.target.plugins.os.windows.registry import RegistryPlugin
-from dissect.util import ts
 
 EXTENSIONS = ("upr", "upf", "upr.zip", "upf.zip")
 

dissect/target/plugins/apps/remoteaccess/remoteaccess.py

@@ -1,6 +1,6 @@
 from dissect.target.exceptions import UnsupportedPluginError
-from dissect.target.helpers.record import create_extended_descriptor
 from dissect.target.helpers.descriptor_extensions import UserRecordDescriptorExtension
+from dissect.target.helpers.record import create_extended_descriptor
 from dissect.target.plugin import Plugin, export
 
 RemoteAccessRecord = create_extended_descriptor([UserRecordDescriptorExtension])(

dissect/target/plugins/browsers/chromium.py

@@ -1,15 +1,14 @@
 from typing import Iterator
 
-from flow.record import Record
-
 from dissect.sql import sqlite3
 from dissect.sql.exceptions import Error as SQLError
 from dissect.sql.sqlite3 import SQLite3
 from dissect.util.ts import webkittimestamp
+from flow.record import Record
 
-from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.exceptions import FileNotFoundError, UnsupportedPluginError
 from dissect.target.helpers.descriptor_extensions import UserRecordDescriptorExtension
+from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.helpers.record import create_extended_descriptor
 from dissect.target.plugin import Plugin, export
 from dissect.target.plugins.browsers.browser import (

dissect/target/plugins/filesystem/icat.py

@@ -1,10 +1,11 @@
-import sys
 import shutil
+import sys
 
 import dissect.extfs.exceptions
 import dissect.ntfs.exceptions
 import dissect.xfs.exceptions
-from dissect.target.plugin import Plugin, export, arg
+
+from dissect.target.plugin import Plugin, arg, export
 
 
 class ICatPlugin(Plugin):

dissect/target/plugins/filesystem/ntfs/usnjrnl.py

@@ -7,7 +7,6 @@
 from dissect.target.plugin import Plugin, export
 from dissect.target.plugins.filesystem.ntfs.utils import get_drive_letter
 
-
 UsnjrnlRecord = TargetRecordDescriptor(
     "filesystem/ntfs/usnjrnl",
     [

dissect/target/plugins/filesystem/unix/capability.py

@@ -5,7 +5,6 @@
 from dissect.target.helpers.record import TargetRecordDescriptor
 from dissect.target.plugin import Plugin, export
 
-
 CapabilityRecord = TargetRecordDescriptor(
     "filesystem/unix/capability",
     [

dissect/target/plugins/filesystem/unix/suid.py

@@ -4,7 +4,6 @@
 from dissect.target.plugin import Plugin, export
 from dissect.target.plugins.filesystem.walkfs import FilesystemRecord
 
-
 SuidRecord = TargetRecordDescriptor(
     "filesystem/unix/suid",
     FilesystemRecord.target_fields,

dissect/target/plugins/filesystem/yara.py

@@ -5,8 +5,7 @@
 
 from dissect.target.exceptions import FileNotFoundError
 from dissect.target.helpers.record import TargetRecordDescriptor
-from dissect.target.plugin import Plugin, export, arg
-
+from dissect.target.plugin import Plugin, arg, export
 
 YaraMatchRecord = TargetRecordDescriptor(
     "filesystem/yara/match",

dissect/target/plugins/general/example.py

@@ -4,10 +4,12 @@
     RegistryRecordDescriptorExtension,
     UserRecordDescriptorExtension,
 )
-from dissect.target.helpers.record import TargetRecordDescriptor, create_extended_descriptor
+from dissect.target.helpers.record import (
+    TargetRecordDescriptor,
+    create_extended_descriptor,
+)
 from dissect.target.plugin import Plugin, arg, export, internal
 
-
 ExampleRecordRecord = TargetRecordDescriptor(
     "example/descriptor",
     [

dissect/target/plugins/general/plugins.py

@@ -1,5 +1,5 @@
 import textwrap
-from typing import Dict, List, Union, Type
+from typing import Dict, List, Type, Union
 
 from dissect.target import plugin
 from dissect.target.helpers.docs import INDENT_STEP, get_plugin_overview

dissect/target/plugins/general/scrape.py

@@ -1,6 +1,5 @@
 import io
-
-from typing import Generator, List, Tuple, Dict, Callable, BinaryIO
+from typing import BinaryIO, Callable, Dict, Generator, List, Tuple
 
 from dissect.target import plugin
 from dissect.target.helpers.record import TargetRecordDescriptor

dissect/target/plugins/general/users.py

@@ -5,7 +5,6 @@
 
 from dissect.target.plugin import InternalPlugin
 
-
 UserDetails = namedtuple("UserDetails", "user home_path")
 
 

dissect/target/plugins/os/unix/bsd/ios/_os.py

@@ -1,6 +1,6 @@
 import plistlib
 
-from dissect.target.plugin import export, OperatingSystem
+from dissect.target.plugin import OperatingSystem, export
 from dissect.target.plugins.os.unix.bsd._os import BsdPlugin
 
 

dissect/target/plugins/os/unix/linux/android/_os.py

@@ -4,7 +4,7 @@
 
 from dissect.target.filesystem import Filesystem
 from dissect.target.helpers.record import UnixUserRecord
-from dissect.target.plugin import OSPlugin, OperatingSystem, export
+from dissect.target.plugin import OperatingSystem, OSPlugin, export
 from dissect.target.target import Target
 
 

dissect/target/plugins/os/unix/linux/debian/dpkg.py

@@ -1,6 +1,6 @@
 import gzip
 from datetime import datetime
-from typing import List, Dict, TextIO, Generator
+from typing import Dict, Generator, List, TextIO
 
 from dissect.target.helpers.record import TargetRecordDescriptor
 from dissect.target.plugin import Plugin, export

dissect/target/plugins/os/unix/linux/fortigate/_os.py

@@ -7,7 +7,7 @@
 
 from dissect.target.filesystem import Filesystem
 from dissect.target.helpers.record import UnixUserRecord
-from dissect.target.plugin import export, OperatingSystem
+from dissect.target.plugin import OperatingSystem, export
 from dissect.target.plugins.os.unix.linux._os import LinuxPlugin
 from dissect.target.target import Target
 

dissect/target/plugins/os/unix/locale.py

@@ -1,5 +1,5 @@
-from dissect.target.helpers.record import TargetRecordDescriptor
 from dissect.target.helpers.localeutil import normalize_language
+from dissect.target.helpers.record import TargetRecordDescriptor
 from dissect.target.plugin import Plugin, export
 
 UnixKeyboardRecord = TargetRecordDescriptor(

dissect/target/plugins/os/unix/shadow.py

@@ -3,7 +3,6 @@
 from dissect.target.helpers.record import TargetRecordDescriptor
 from dissect.target.plugin import Plugin, export
 
-
 UnixShadowRecord = TargetRecordDescriptor(
     "linux/shadow",
     [

dissect/target/plugins/os/unix/ssh.py

@@ -1,9 +1,8 @@
 import re
 import subprocess
 
-from dissect.target.plugin import Plugin, export
 from dissect.target.helpers.record import TargetRecordDescriptor
-
+from dissect.target.plugin import Plugin, export
 
 AuthorizedKeysRecord = TargetRecordDescriptor(
     "unix/ssh/authorized_keys",

dissect/target/plugins/os/windows/_os.py

@@ -6,7 +6,7 @@
 from dissect.target.exceptions import RegistryError, RegistryValueNotFoundError
 from dissect.target.filesystem import Filesystem
 from dissect.target.helpers.record import WindowsUserRecord
-from dissect.target.plugin import export, OperatingSystem, OSPlugin
+from dissect.target.plugin import OperatingSystem, OSPlugin, export
 from dissect.target.target import Target
 
 

dissect/target/plugins/os/windows/cim.py

@@ -1,6 +1,7 @@
 from typing import Iterator
 
 from dissect.cim import cim
+
 from dissect.target.exceptions import UnsupportedPluginError
 from dissect.target.helpers.record import TargetRecordDescriptor
 from dissect.target.plugin import Plugin, export, internal

dissect/target/plugins/os/windows/clfs.py

@@ -9,7 +9,6 @@
 from dissect.target.plugin import Plugin, export
 from dissect.target.target import Target
 
-
 ClfsRecord = TargetRecordDescriptor(
     "filesystem/windows/clfs",
     [

dissect/target/plugins/os/windows/env.py

@@ -1,14 +1,16 @@
 import re
-from collections import namedtuple, OrderedDict
+from collections import OrderedDict, namedtuple
 from typing import Iterator, List, Optional, Set
 
 from dissect.target import Target
 from dissect.target.exceptions import RegistryError
-from dissect.target.helpers.record import TargetRecordDescriptor, create_extended_descriptor
 from dissect.target.helpers.descriptor_extensions import UserRecordDescriptorExtension
+from dissect.target.helpers.record import (
+    TargetRecordDescriptor,
+    create_extended_descriptor,
+)
 from dissect.target.plugin import Plugin, export, internal
 
-
 EnvironmentRecord = create_extended_descriptor([UserRecordDescriptorExtension])(
     "windows/environment",
     [

dissect/target/plugins/os/windows/iis.py

@@ -1,18 +1,16 @@
 import re
+from datetime import datetime, timezone
 from functools import lru_cache
+from pathlib import Path
 from typing import Generator, List, Tuple
 
-from pathlib import Path
-from datetime import datetime, timezone
 from defusedxml import ElementTree
-
 from flow.record.base import RE_VALID_FIELD_NAME
 
 from dissect.target import plugin
+from dissect.target.exceptions import UnsupportedPluginError
 from dissect.target.helpers import fsutil
 from dissect.target.helpers.record import TargetRecordDescriptor
-from dissect.target.exceptions import UnsupportedPluginError
-
 
 LOG_RECORD_NAME = "filesystem/windows/iis/logs"