Merge pull request #35 from tpiekarski/feature/resort-regroup-imports

Merging feature/resort-regroup-imports, resolves #33

.vscode/settings.json

@@ -1,5 +1,8 @@
 {
     "[python]": {
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": true
+        },
         "editor.rulers": [
             100,
             120

README.md

@@ -224,6 +224,7 @@ derl tests/test-directory/ --context --dispatch > tests/references/output-with-c
 
 ## [Links](#links)
 
+- Blog, eshlox, [VS Code - sort Python imports automatically](https://eshlox.net/2019/12/02/vscode-sort-python-imports-automatically)
 - Digital Ocean, [How-To Use String Formatters in Python 3](https://www.digitalocean.com/community/tutorials/how-to-use-string-formatters-in-python-3)
 - Findwork, [Advanced usage of Python requests - timeouts, retries, hooks](https://findwork.dev/blog/advanced-usage-python-requests-timeouts-retries-hooks/)
 - Geeks for geeks, [Testing Output to stdout](https://www.geeksforgeeks.org/python-testing-output-to-stdout/)

src/derl/__init__.py

@@ -4,7 +4,7 @@
 # Copyright 2020 Thomas Piekarski <[email protected]>
 #
 
-from pkg_resources import get_distribution, DistributionNotFound
+from pkg_resources import DistributionNotFound, get_distribution
 
 try:
     DIST_NAME = __name__

src/derl/checker.py

@@ -5,10 +5,10 @@
 #
 
 import sys
-
 from argparse import Namespace
 from logging import getLogger
 from os import path
+
 from magic import from_file
 from validators import url
 

src/derl/dispatcher.py

@@ -11,9 +11,8 @@
 from aiohttp.client_exceptions import ClientConnectionError, TooManyRedirects
 from aiohttp_retry import RetryClient
 
-from derl.tracker import get_tracker
 from derl import __version__
-
+from derl.tracker import get_tracker
 
 _logger = logging.getLogger(__name__)
 _tracker = get_tracker()

src/derl/main.py

@@ -6,8 +6,7 @@
 
 
 import sys
-
-from logging import basicConfig, getLogger, ERROR
+from logging import ERROR, basicConfig, getLogger
 
 from derl.checker import check_arguments
 from derl.collector import collect_context

src/derl/outputer.py

@@ -5,6 +5,7 @@
 #
 
 from logging import getLogger
+
 from derl.tracker import get_tracker
 
 _logger = getLogger(__name__)

src/derl/processor.py

@@ -6,7 +6,8 @@
 
 from logging import getLogger
 from pathlib import Path
-from re import compile as rcompile, IGNORECASE
+from re import IGNORECASE
+from re import compile as rcompile
 from typing import TextIO
 
 from derl.checker import is_text_file, is_url

tests/test_checker.py

@@ -4,8 +4,8 @@
 # Copyright 2020 Thomas Piekarski <[email protected]>
 #
 
-from unittest import TestCase
 from pathlib import Path
+from unittest import TestCase
 
 from derl.checker import is_directory, is_text_file
 

tests/test_main.py

@@ -10,10 +10,11 @@
 
 from pytest import raises
 
+from conftest import (_TEST_DIRECTORY, _TEST_REQUEST_RETRIES,
+                      _TEST_REQUESTS_TIMEOUT)
 from derl.checker import _INVALID_DIRECTORY, _INVALID_RETRY, _INVALID_TIMEOUT
 from derl.main import main, run
 from derl.tracker import get_tracker
-from conftest import _TEST_DIRECTORY, _TEST_REQUEST_RETRIES, _TEST_REQUESTS_TIMEOUT
 
 _tracker = get_tracker()
 

tests/test_processor.py

@@ -6,8 +6,8 @@
 
 from unittest import TestCase
 
-from derl.processor import process_directory, process_file, process_line
 from conftest import _TEST_DIRECTORY
+from derl.processor import process_directory, process_file, process_line
 
 
 class ProcessorTest(TestCase):