Add isort to flake8 linting (#58)

(DIS-1789)

flow/record/adapter/broker.py

@@ -1,6 +1,7 @@
-from flow.record.adapter import AbstractWriter, AbstractReader
 from flow.broker import Publisher, Subscriber
 
+from flow.record.adapter import AbstractReader, AbstractWriter
+
 __usage__ = """
 PubSub adapter using flow.broker
 ---

flow/record/adapter/jsonfile.py

@@ -1,10 +1,11 @@
 import json
+
 from flow import record
 from flow.record import JsonRecordPacker
-from flow.record.utils import is_stdout
-from flow.record.selector import make_selector
-from flow.record.adapter import AbstractWriter, AbstractReader
+from flow.record.adapter import AbstractReader, AbstractWriter
 from flow.record.fieldtypes import fieldtype_for_value
+from flow.record.selector import make_selector
+from flow.record.utils import is_stdout
 
 __usage__ = """
 JSON adapter

flow/record/adapter/line.py

@@ -1,5 +1,5 @@
-from flow.record.adapter import AbstractWriter
 from flow.record import open_path
+from flow.record.adapter import AbstractWriter
 from flow.record.utils import is_stdout
 
 __usage__ = """

flow/record/adapter/mongo.py

@@ -1,8 +1,9 @@
 import bson
+from pymongo import MongoClient
+
 from flow import record
 from flow.record.adapter import AbstractReader, AbstractWriter
 from flow.record.selector import make_selector
-from pymongo import MongoClient
 
 __usage__ = """
 MongoDB adapter

flow/record/adapter/split.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-
 from urllib.parse import urlparse
 
 from flow.record.adapter import AbstractWriter

flow/record/adapter/splunk.py

@@ -1,8 +1,8 @@
-import socket
 import logging
+import socket
 
 from flow.record.adapter import AbstractReader, AbstractWriter
-from flow.record.utils import to_str, to_bytes, to_base64
+from flow.record.utils import to_base64, to_bytes, to_str
 
 __usage__ = """
 Splunk output adapter (writer only)

flow/record/adapter/stream.py

@@ -1,6 +1,6 @@
 from flow import record
-from flow.record.utils import is_stdout
 from flow.record.adapter import AbstractReader, AbstractWriter
+from flow.record.utils import is_stdout
 
 __usage__ = """
 Binary stream adapter (default adapter if none are specified)

flow/record/adapter/text.py

@@ -1,6 +1,6 @@
 from flow.record import open_path
-from flow.record.utils import is_stdout
 from flow.record.adapter import AbstractWriter
+from flow.record.utils import is_stdout
 
 __usage__ = """
 Textual output adapter, similar to `repr()` (writer only)

flow/record/adapter/xlsx.py

@@ -1,9 +1,9 @@
 import openpyxl
 
 from flow import record
-from flow.record.utils import is_stdout
+from flow.record.adapter import AbstractReader, AbstractWriter
 from flow.record.selector import make_selector
-from flow.record.adapter import AbstractWriter, AbstractReader
+from flow.record.utils import is_stdout
 
 __usage__ = """
 Microsoft Excel spreadsheet adapter

flow/record/fieldtypes/__init__.py

@@ -4,7 +4,8 @@
 import pathlib
 import re
 from binascii import a2b_hex, b2a_hex
-from datetime import datetime as _dt, timezone
+from datetime import datetime as _dt
+from datetime import timezone
 from posixpath import basename, dirname
 from typing import Tuple
 

flow/record/fieldtypes/net/__init__.py

@@ -1,5 +1,6 @@
 from flow.record.fieldtypes import string
-from .ip import ipaddress, ipnetwork, IPAddress, IPNetwork
+
+from .ip import IPAddress, IPNetwork, ipaddress, ipnetwork
 
 __all__ = [
     "ipaddress",

flow/record/fieldtypes/net/ip.py

@@ -1,4 +1,5 @@
 from ipaddress import ip_address, ip_network
+
 from flow.record.base import FieldType
 from flow.record.fieldtypes import defang
 

flow/record/fieldtypes/net/ipv4.py

@@ -1,5 +1,5 @@
-import struct
 import socket
+import struct
 import warnings
 
 from flow.record import FieldType

flow/record/stream.py

@@ -1,19 +1,19 @@
 from __future__ import print_function
 
+import datetime
+import logging
 import os
-import sys
 import struct
-import logging
-import datetime
-from functools import lru_cache
+import sys
 from collections import ChainMap
+from functools import lru_cache
 
-from .base import RecordDescriptor, RecordReader
-from .packer import RecordPacker
 from flow.record import RecordWriter
-from flow.record.selector import make_selector
 from flow.record.fieldtypes import fieldtype_for_value
+from flow.record.selector import make_selector
 
+from .base import RecordDescriptor, RecordReader
+from .packer import RecordPacker
 
 log = logging.getLogger(__package__)
 

flow/record/tools/geoip.py

@@ -1,22 +1,17 @@
 # Python imports
-import re
-import sys
-import random
 import argparse
 import logging
-
-# Flow imports
-from flow.record.utils import catch_sigpipe
-from flow.record import (
-    RecordDescriptor,
-    RecordWriter,
-    record_stream,
-    extend_record,
-)
+import random
+import re
+import sys
 
 # Third party imports
 import maxminddb
 
+from flow.record import RecordDescriptor, RecordWriter, extend_record, record_stream
+
+# Flow imports
+from flow.record.utils import catch_sigpipe
 
 logger = logging.getLogger(__name__)
 

flow/record/utils.py

@@ -1,6 +1,6 @@
+import base64
 import os
 import sys
-import base64
 from functools import wraps
 
 _native = str

setup.py

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

tests/selector_explain_example.py

@@ -1,5 +1,5 @@
-from flow.record.selector import Selector
 from flow.record import RecordDescriptor
+from flow.record.selector import Selector
 
 desc = RecordDescriptor(
     "test/samplerecord",

tests/test_fieldtype_ip.py

@@ -1,13 +1,13 @@
 from __future__ import unicode_literals
-import random
+
 import ipaddress
+import random
 
 import pytest
 
-from flow.record import RecordDescriptor, RecordWriter, RecordReader
-from flow.record import RecordPacker
+from flow.record import RecordDescriptor, RecordPacker, RecordReader, RecordWriter
 from flow.record.fieldtypes import net
-from flow.record.selector import Selector, CompiledSelector
+from flow.record.selector import CompiledSelector, Selector
 
 
 def test_field_ipaddress():

tests/test_json_packer.py

@@ -1,11 +1,11 @@
 import json
 from datetime import datetime
 
+import pytest
+
 from flow.record import JsonRecordPacker, RecordDescriptor, fieldtypes
 from flow.record.exceptions import RecordDescriptorNotFound
 
-import pytest
-
 
 def test_record_in_record():
     packer = JsonRecordPacker()

tests/test_json_record_adapter.py

@@ -1,9 +1,10 @@
-import json
 import datetime
-from flow.record import RecordDescriptor, RecordWriter, RecordReader
+import json
 
 import pytest
 
+from flow.record import RecordDescriptor, RecordReader, RecordWriter
+
 
 def generate_records(count=100):
     TestRecordEmbedded = RecordDescriptor(

tests/test_multi_timestamp.py

@@ -1,7 +1,6 @@
 import datetime
 
-from flow.record import RecordDescriptor
-from flow.record import iter_timestamped_records
+from flow.record import RecordDescriptor, iter_timestamped_records
 from flow.record.base import merge_record_descriptors
 
 

tests/test_record.py

@@ -1,15 +1,23 @@
 import sys
+
 import pytest
-from flow.record import RECORD_VERSION
-from flow.record import RecordDescriptor
-from flow.record import RecordPacker
-from flow.record import RecordWriter, RecordReader, RecordPrinter
-from flow.record import Record, GroupedRecord
-from flow.record import record_stream, extend_record
-from flow.record import fieldtypes
+
+from flow.record import (
+    RECORD_VERSION,
+    GroupedRecord,
+    Record,
+    RecordDescriptor,
+    RecordPacker,
+    RecordPrinter,
+    RecordReader,
+    RecordWriter,
+    extend_record,
+    fieldtypes,
+    record_stream,
+)
 from flow.record.base import merge_record_descriptors
-from flow.record.stream import RecordFieldRewriter
 from flow.record.exceptions import RecordDescriptorError
+from flow.record.stream import RecordFieldRewriter
 
 from . import utils_inspect as inspect
 

tests/utils_inspect.py

@@ -4,8 +4,8 @@
 Based on: https://github.com/python/cpython/blob/3.7/Lib/inspect.py
 """
 
-import inspect
 import collections
+import inspect
 
 
 class _empty:

tox.ini

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