From b288c5bff7c6af105d6f0d7cad1f6e2d2da3eb74 Mon Sep 17 00:00:00 2001 From: pyrco <105293448+pyrco@users.noreply.github.com> Date: Tue, 7 Feb 2023 09:39:18 +0100 Subject: [PATCH] Add isort to flake8 linting (#12) (DIS-1789) --- dissect/evidence/__init__.py | 3 +-- dissect/evidence/ad1.py | 2 +- dissect/evidence/ewf.py | 4 ++-- dissect/evidence/tools/asdf/meta.py | 10 +++++----- tests/test_ad1.py | 1 + tox.ini | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dissect/evidence/__init__.py b/dissect/evidence/__init__.py index e81a6f5..3e94953 100644 --- a/dissect/evidence/__init__.py +++ b/dissect/evidence/__init__.py @@ -1,7 +1,6 @@ +from dissect.evidence.asdf.asdf import AsdfSnapshot, AsdfStream from dissect.evidence.ewf import EWF -from dissect.evidence.asdf.asdf import AsdfStream, AsdfSnapshot - __all__ = [ "AsdfSnapshot", "AsdfStream", diff --git a/dissect/evidence/ad1.py b/dissect/evidence/ad1.py index 267033b..e3ba39a 100644 --- a/dissect/evidence/ad1.py +++ b/dissect/evidence/ad1.py @@ -1,7 +1,7 @@ import zlib from dissect import cstruct -from dissect.util.stream import RelativeStream, AlignedStream +from dissect.util.stream import AlignedStream, RelativeStream ad1_def = """ enum EntryType : uint32 { diff --git a/dissect/evidence/ewf.py b/dissect/evidence/ewf.py index e1c2b7c..a8ae507 100644 --- a/dissect/evidence/ewf.py +++ b/dissect/evidence/ewf.py @@ -1,11 +1,11 @@ from __future__ import print_function +import logging import os import zlib -import logging -from pathlib import Path from bisect import bisect_right from functools import lru_cache +from pathlib import Path from dissect import cstruct from dissect.util.stream import AlignedStream diff --git a/dissect/evidence/tools/asdf/meta.py b/dissect/evidence/tools/asdf/meta.py index 71db5ae..2f8eb6f 100644 --- a/dissect/evidence/tools/asdf/meta.py +++ b/dissect/evidence/tools/asdf/meta.py @@ -1,10 +1,10 @@ +import argparse +import datetime +import hashlib import io -import sys -import stat import shutil -import hashlib -import datetime -import argparse +import stat +import sys from dissect.evidence.asdf import asdf diff --git a/tests/test_ad1.py b/tests/test_ad1.py index 27fdfa9..67afdee 100644 --- a/tests/test_ad1.py +++ b/tests/test_ad1.py @@ -1,4 +1,5 @@ import hashlib + from dissect.evidence import ad1 diff --git a/tox.ini b/tox.ini index 2160d23..f2b225f 100644 --- a/tox.ini +++ b/tox.ini @@ -39,6 +39,7 @@ deps = black==23.1.0 flake8 flake8-black + flake8-isort vermin commands = flake8 dissect tests setup.py