From 3a50da5fdfa27528c43c12e8795725b99cc86609 Mon Sep 17 00:00:00 2001 From: Thomas Piekarski Date: Fri, 17 Jul 2020 12:28:59 +0200 Subject: [PATCH 1/2] Re-sorting and re-grouping all imports following PEP8 --- src/derl/__init__.py | 2 +- src/derl/checker.py | 2 +- src/derl/dispatcher.py | 3 +-- src/derl/main.py | 3 +-- src/derl/outputer.py | 1 + src/derl/processor.py | 3 ++- tests/test_checker.py | 2 +- tests/test_main.py | 3 ++- tests/test_processor.py | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/derl/__init__.py b/src/derl/__init__.py index 6919435..302eb14 100644 --- a/src/derl/__init__.py +++ b/src/derl/__init__.py @@ -4,7 +4,7 @@ # Copyright 2020 Thomas Piekarski # -from pkg_resources import get_distribution, DistributionNotFound +from pkg_resources import DistributionNotFound, get_distribution try: DIST_NAME = __name__ diff --git a/src/derl/checker.py b/src/derl/checker.py index 76d47b5..3e86665 100644 --- a/src/derl/checker.py +++ b/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 diff --git a/src/derl/dispatcher.py b/src/derl/dispatcher.py index 64403cf..723068b 100644 --- a/src/derl/dispatcher.py +++ b/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() diff --git a/src/derl/main.py b/src/derl/main.py index 686eb86..cd2961f 100644 --- a/src/derl/main.py +++ b/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 diff --git a/src/derl/outputer.py b/src/derl/outputer.py index 4762cfb..329798a 100644 --- a/src/derl/outputer.py +++ b/src/derl/outputer.py @@ -5,6 +5,7 @@ # from logging import getLogger + from derl.tracker import get_tracker _logger = getLogger(__name__) diff --git a/src/derl/processor.py b/src/derl/processor.py index 04a8846..d2e5638 100644 --- a/src/derl/processor.py +++ b/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 diff --git a/tests/test_checker.py b/tests/test_checker.py index 735e810..fad53cc 100644 --- a/tests/test_checker.py +++ b/tests/test_checker.py @@ -4,8 +4,8 @@ # Copyright 2020 Thomas Piekarski # -from unittest import TestCase from pathlib import Path +from unittest import TestCase from derl.checker import is_directory, is_text_file diff --git a/tests/test_main.py b/tests/test_main.py index 8e6c848..785b8a1 100644 --- a/tests/test_main.py +++ b/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() diff --git a/tests/test_processor.py b/tests/test_processor.py index e0099e3..f6b65fe 100644 --- a/tests/test_processor.py +++ b/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): From bf18f870c7f4d751225c15e6371550e04547f538 Mon Sep 17 00:00:00 2001 From: Thomas Piekarski Date: Fri, 17 Jul 2020 12:29:33 +0200 Subject: [PATCH 2/2] Organizing imports upon saving files --- .vscode/settings.json | 3 +++ README.md | 1 + 2 files changed, 4 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index b0a9a65..0fcd3ef 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,8 @@ { "[python]": { + "editor.codeActionsOnSave": { + "source.organizeImports": true + }, "editor.rulers": [ 100, 120 diff --git a/README.md b/README.md index 30bec3c..69001a5 100644 --- a/README.md +++ b/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/)