From: Aleš Mrázek <ales.mrazek@nic.cz>
Date: Thu, 29 Aug 2024 13:31:23 +0000 (+0200)
Subject: python/knot_resolver: imports formatting
X-Git-Tag: v6.0.9~18^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46ff46444cd31cebf403ff2c539099fa18f7bdd2;p=thirdparty%2Fknot-resolver.git

python/knot_resolver: imports formatting
---

diff --git a/python/knot_resolver/__init__.py b/python/knot_resolver/__init__.py
index 4529ec683..a91e45939 100644
--- a/python/knot_resolver/__init__.py
+++ b/python/knot_resolver/__init__.py
@@ -1,5 +1,5 @@
-from .exceptions import KresBaseException
 from .constants import VERSION
+from .exceptions import KresBaseException
 
 __version__ = VERSION
 
diff --git a/python/knot_resolver/client/command.py b/python/knot_resolver/client/command.py
index 5d1bc3c7e..da42f2cf4 100644
--- a/python/knot_resolver/client/command.py
+++ b/python/knot_resolver/client/command.py
@@ -6,10 +6,10 @@ from typing import Dict, List, Optional, Tuple, Type, TypeVar
 from urllib.parse import quote
 
 from knot_resolver.constants import (
+    API_SOCK_PATH_DEFAULT,
+    API_SOCK_PATH_ENV_VAR,
     CONFIG_FILE_PATH_DEFAULT,
     CONFIG_FILE_PATH_ENV_VAR,
-    API_SOCK_PATH_ENV_VAR,
-    API_SOCK_PATH_DEFAULT,
 )
 from knot_resolver.datamodel.types import IPAddressPort
 from knot_resolver.utils.modeling import parsing
diff --git a/python/knot_resolver/client/commands/convert.py b/python/knot_resolver/client/commands/convert.py
index a25c5cd97..412ed334c 100644
--- a/python/knot_resolver/client/commands/convert.py
+++ b/python/knot_resolver/client/commands/convert.py
@@ -5,11 +5,7 @@ from typing import List, Optional, Tuple, Type
 
 from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
 from knot_resolver.datamodel import KresConfig
-from knot_resolver.datamodel.globals import (
-    Context,
-    reset_global_validation_context,
-    set_global_validation_context,
-)
+from knot_resolver.datamodel.globals import Context, reset_global_validation_context, set_global_validation_context
 from knot_resolver.utils.modeling import try_to_parse
 from knot_resolver.utils.modeling.exceptions import DataParsingError, DataValidationError
 
diff --git a/python/knot_resolver/client/commands/validate.py b/python/knot_resolver/client/commands/validate.py
index 267bf562a..f74777481 100644
--- a/python/knot_resolver/client/commands/validate.py
+++ b/python/knot_resolver/client/commands/validate.py
@@ -5,11 +5,7 @@ from typing import List, Tuple, Type
 
 from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
 from knot_resolver.datamodel import KresConfig
-from knot_resolver.datamodel.globals import (
-    Context,
-    reset_global_validation_context,
-    set_global_validation_context,
-)
+from knot_resolver.datamodel.globals import Context, reset_global_validation_context, set_global_validation_context
 from knot_resolver.utils.modeling import try_to_parse
 from knot_resolver.utils.modeling.exceptions import DataParsingError, DataValidationError
 
diff --git a/python/knot_resolver/client/main.py b/python/knot_resolver/client/main.py
index f48b46a9b..75cd6a77f 100644
--- a/python/knot_resolver/client/main.py
+++ b/python/knot_resolver/client/main.py
@@ -4,8 +4,8 @@ import os
 
 from knot_resolver.constants import VERSION
 
+from .client import KRES_CLIENT_NAME, KresClient
 from .command import install_commands_parsers
-from .client import KresClient, KRES_CLIENT_NAME
 
 
 def auto_import_commands() -> None:
diff --git a/python/knot_resolver/constants.py b/python/knot_resolver/constants.py
index f65876f1f..f63478d4a 100644
--- a/python/knot_resolver/constants.py
+++ b/python/knot_resolver/constants.py
@@ -1,5 +1,4 @@
 import logging
-
 from importlib.metadata import version
 from importlib.util import find_spec
 from pathlib import Path
diff --git a/python/knot_resolver/controller/__init__.py b/python/knot_resolver/controller/__init__.py
index 2398347e0..5dc2fc554 100644
--- a/python/knot_resolver/controller/__init__.py
+++ b/python/knot_resolver/controller/__init__.py
@@ -12,8 +12,8 @@ import asyncio
 import logging
 from typing import List, Optional
 
-from knot_resolver.datamodel.config_schema import KresConfig
 from knot_resolver.controller.interface import SubprocessController
+from knot_resolver.datamodel.config_schema import KresConfig
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver/controller/interface.py b/python/knot_resolver/controller/interface.py
index ba9ac28d3..906592cbc 100644
--- a/python/knot_resolver/controller/interface.py
+++ b/python/knot_resolver/controller/interface.py
@@ -10,10 +10,10 @@ from pathlib import Path
 from typing import Dict, Iterable, Optional, Type, TypeVar
 from weakref import WeakValueDictionary
 
-from knot_resolver.manager.constants import kresd_config_file, policy_loader_config_file
-from knot_resolver.datamodel.config_schema import KresConfig
 from knot_resolver.controller.exceptions import SubprocessControllerException
 from knot_resolver.controller.registered_workers import register_worker, unregister_worker
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.manager.constants import kresd_config_file, policy_loader_config_file
 from knot_resolver.utils.async_utils import writefile
 
 logger = logging.getLogger(__name__)
diff --git a/python/knot_resolver/controller/supervisord/__init__.py b/python/knot_resolver/controller/supervisord/__init__.py
index b9f3cae20..b55a7ef1a 100644
--- a/python/knot_resolver/controller/supervisord/__init__.py
+++ b/python/knot_resolver/controller/supervisord/__init__.py
@@ -7,9 +7,7 @@ from xmlrpc.client import Fault, ServerProxy
 import supervisor.xmlrpc  # type: ignore[import]
 
 from knot_resolver.compat.asyncio import async_in_a_thread
-from knot_resolver.manager.constants import supervisord_config_file, supervisord_pid_file, supervisord_sock_file
-from knot_resolver.datamodel.config_schema import KresConfig
-from knot_resolver.controller.exceptions import SubprocessControllerExecException, SubprocessControllerException
+from knot_resolver.controller.exceptions import SubprocessControllerException, SubprocessControllerExecException
 from knot_resolver.controller.interface import (
     KresID,
     Subprocess,
@@ -18,6 +16,8 @@ from knot_resolver.controller.interface import (
     SubprocessType,
 )
 from knot_resolver.controller.supervisord.config_file import SupervisordKresID, write_config_file
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.manager.constants import supervisord_config_file, supervisord_pid_file, supervisord_sock_file
 from knot_resolver.utils import which
 from knot_resolver.utils.async_utils import call, readfile
 
diff --git a/python/knot_resolver/controller/supervisord/config_file.py b/python/knot_resolver/controller/supervisord/config_file.py
index f9b80f919..a9144505b 100644
--- a/python/knot_resolver/controller/supervisord/config_file.py
+++ b/python/knot_resolver/controller/supervisord/config_file.py
@@ -1,15 +1,15 @@
 import logging
 import os
-
-from typing import Literal
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Literal
+
 from jinja2 import Template
 
-from knot_resolver.constants import (
-    kres_cache_gc_executable,
-    kresd_executable,
-)
+from knot_resolver.constants import kres_cache_gc_executable, kresd_executable
+from knot_resolver.controller.interface import KresID, SubprocessType
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.datamodel.logging_schema import LogTargetEnum
 from knot_resolver.manager.constants import (
     kres_cache_dir,
     kresd_config_file_supervisord_pattern,
@@ -21,9 +21,6 @@ from knot_resolver.manager.constants import (
     supervisord_subprocess_log_dir,
     user_constants,
 )
-from knot_resolver.datamodel.config_schema import KresConfig
-from knot_resolver.datamodel.logging_schema import LogTargetEnum
-from knot_resolver.controller.interface import KresID, SubprocessType
 from knot_resolver.utils.async_utils import read_resource, writefile
 
 logger = logging.getLogger(__name__)
diff --git a/python/knot_resolver/datamodel/config_schema.py b/python/knot_resolver/datamodel/config_schema.py
index 50d060c49..fa108e79c 100644
--- a/python/knot_resolver/datamodel/config_schema.py
+++ b/python/knot_resolver/datamodel/config_schema.py
@@ -3,8 +3,7 @@ import os
 import socket
 from typing import Any, Dict, List, Literal, Optional, Tuple, Union
 
-from knot_resolver.constants import RUN_DIR_DEFAULT, API_SOCK_PATH_DEFAULT, WORKERS_MAX_DEFAULT
-
+from knot_resolver.constants import API_SOCK_PATH_DEFAULT, RUN_DIR_DEFAULT, WORKERS_MAX_DEFAULT
 from knot_resolver.datamodel.cache_schema import CacheSchema
 from knot_resolver.datamodel.dns64_schema import Dns64Schema
 from knot_resolver.datamodel.dnssec_schema import DnssecSchema
diff --git a/python/knot_resolver/datamodel/forward_schema.py b/python/knot_resolver/datamodel/forward_schema.py
index 9c8cc00ab..3e3af21dd 100644
--- a/python/knot_resolver/datamodel/forward_schema.py
+++ b/python/knot_resolver/datamodel/forward_schema.py
@@ -1,12 +1,6 @@
 from typing import Any, List, Literal, Optional, Union
 
-from knot_resolver.datamodel.types import (
-    DomainName,
-    IPAddressOptionalPort,
-    ListOrItem,
-    PinSha256,
-    ReadableFile,
-)
+from knot_resolver.datamodel.types import DomainName, IPAddressOptionalPort, ListOrItem, PinSha256, ReadableFile
 from knot_resolver.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver/datamodel/management_schema.py b/python/knot_resolver/datamodel/management_schema.py
index b338c32a0..1ad01d377 100644
--- a/python/knot_resolver/datamodel/management_schema.py
+++ b/python/knot_resolver/datamodel/management_schema.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from knot_resolver.datamodel.types import WritableFilePath, IPAddressPort
+from knot_resolver.datamodel.types import IPAddressPort, WritableFilePath
 from knot_resolver.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver/datamodel/network_schema.py b/python/knot_resolver/datamodel/network_schema.py
index 2489601d0..3063cef2e 100644
--- a/python/knot_resolver/datamodel/network_schema.py
+++ b/python/knot_resolver/datamodel/network_schema.py
@@ -2,7 +2,6 @@ from typing import List, Literal, Optional, Union
 
 from knot_resolver.datamodel.types import (
     EscapedStr32B,
-    WritableFilePath,
     Int0_512,
     Int0_65535,
     InterfaceOptionalPort,
@@ -15,6 +14,7 @@ from knot_resolver.datamodel.types import (
     PortNumber,
     ReadableFile,
     SizeUnit,
+    WritableFilePath,
 )
 from knot_resolver.utils.modeling import ConfigSchema
 
diff --git a/python/knot_resolver/datamodel/types/files.py b/python/knot_resolver/datamodel/types/files.py
index 2dde21e16..5f46c3a17 100644
--- a/python/knot_resolver/datamodel/types/files.py
+++ b/python/knot_resolver/datamodel/types/files.py
@@ -1,12 +1,12 @@
 import os
 import stat
-from enum import auto, Flag
+from enum import Flag, auto
 from grp import getgrnam
 from pathlib import Path
 from pwd import getpwnam
 from typing import Any, Dict, Tuple, Type, TypeVar
 
-from knot_resolver.constants import USER_DEFAULT, GROUP_DEFAULT
+from knot_resolver.constants import GROUP_DEFAULT, USER_DEFAULT
 from knot_resolver.datamodel.globals import get_resolve_root, get_strict_validation
 from knot_resolver.utils.modeling.base_value_type import BaseValueType
 
diff --git a/python/knot_resolver/datamodel/types/types.py b/python/knot_resolver/datamodel/types/types.py
index ca8706d2e..1a1257208 100644
--- a/python/knot_resolver/datamodel/types/types.py
+++ b/python/knot_resolver/datamodel/types/types.py
@@ -2,13 +2,7 @@ import ipaddress
 import re
 from typing import Any, Dict, Optional, Type, Union
 
-from knot_resolver.datamodel.types.base_types import (
-    IntRangeBase,
-    PatternBase,
-    StrBase,
-    StringLengthBase,
-    UnitBase,
-)
+from knot_resolver.datamodel.types.base_types import IntRangeBase, PatternBase, StrBase, StringLengthBase, UnitBase
 from knot_resolver.utils.modeling import BaseValueType
 
 
diff --git a/python/knot_resolver/datamodel/webmgmt_schema.py b/python/knot_resolver/datamodel/webmgmt_schema.py
index ce18376b8..c39f84d22 100644
--- a/python/knot_resolver/datamodel/webmgmt_schema.py
+++ b/python/knot_resolver/datamodel/webmgmt_schema.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from knot_resolver.datamodel.types import WritableFilePath, InterfacePort, ReadableFile
+from knot_resolver.datamodel.types import InterfacePort, ReadableFile, WritableFilePath
 from knot_resolver.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver/manager/__main__.py b/python/knot_resolver/manager/__main__.py
index 26aae1d66..1063c0a51 100644
--- a/python/knot_resolver/manager/__main__.py
+++ b/python/knot_resolver/manager/__main__.py
@@ -1,5 +1,4 @@
 from knot_resolver.manager.main import main
 
-
 if __name__ == "__main__":
     main()
diff --git a/python/knot_resolver/manager/config_store.py b/python/knot_resolver/manager/config_store.py
index d783f7384..08fbb71e1 100644
--- a/python/knot_resolver/manager/config_store.py
+++ b/python/knot_resolver/manager/config_store.py
@@ -2,8 +2,8 @@ import asyncio
 from asyncio import Lock
 from typing import Any, Awaitable, Callable, List, Tuple
 
-from knot_resolver.datamodel import KresConfig
 from knot_resolver import KresBaseException
+from knot_resolver.datamodel import KresConfig
 from knot_resolver.utils.functional import Result
 from knot_resolver.utils.modeling.exceptions import DataParsingError
 from knot_resolver.utils.modeling.types import NoneType
diff --git a/python/knot_resolver/manager/constants.py b/python/knot_resolver/manager/constants.py
index c1a668849..580ac4d8e 100644
--- a/python/knot_resolver/manager/constants.py
+++ b/python/knot_resolver/manager/constants.py
@@ -2,9 +2,9 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
-    from knot_resolver.manager.config_store import ConfigStore
-    from knot_resolver.datamodel.config_schema import KresConfig
     from knot_resolver.controller.interface import KresID
+    from knot_resolver.datamodel.config_schema import KresConfig
+    from knot_resolver.manager.config_store import ConfigStore
 
 
 def kres_cache_dir(config: "KresConfig") -> Path:
diff --git a/python/knot_resolver/manager/kres_manager.py b/python/knot_resolver/manager/kres_manager.py
index 913d87241..bf8fb9120 100644
--- a/python/knot_resolver/manager/kres_manager.py
+++ b/python/knot_resolver/manager/kres_manager.py
@@ -7,32 +7,15 @@ from subprocess import SubprocessError
 from typing import Any, Callable, List, Optional
 
 from knot_resolver.compat.asyncio import create_task
-from knot_resolver.manager.config_store import (
-    ConfigStore,
-    only_on_real_changes_update,
-    only_on_real_changes_verifier,
-)
-from knot_resolver.constants import (
-    FIX_COUNTER_ATTEMPTS_MAX,
-    FIX_COUNTER_DECREASE_INTERVAL_SEC,
-    WATCHDOG_INTERVAL_SEC,
-)
+from knot_resolver.constants import FIX_COUNTER_ATTEMPTS_MAX, FIX_COUNTER_DECREASE_INTERVAL_SEC, WATCHDOG_INTERVAL_SEC
 from knot_resolver.controller.exceptions import SubprocessControllerException
-from knot_resolver.controller.interface import (
-    Subprocess,
-    SubprocessController,
-    SubprocessStatus,
-    SubprocessType,
-)
-from knot_resolver.controller.registered_workers import (
-    command_registered_workers,
-    get_registered_workers_kresids,
-)
+from knot_resolver.controller.interface import Subprocess, SubprocessController, SubprocessStatus, SubprocessType
+from knot_resolver.controller.registered_workers import command_registered_workers, get_registered_workers_kresids
+from knot_resolver.datamodel import KresConfig
+from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update, only_on_real_changes_verifier
 from knot_resolver.utils.functional import Result
 from knot_resolver.utils.modeling.types import NoneType
 
-from knot_resolver.datamodel import KresConfig
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/python/knot_resolver/manager/log.py b/python/knot_resolver/manager/log.py
index d34e57fe9..ff140dcd9 100644
--- a/python/knot_resolver/manager/log.py
+++ b/python/knot_resolver/manager/log.py
@@ -5,9 +5,9 @@ import sys
 from typing import Optional
 
 from knot_resolver.constants import LOGGING_LEVEL_STARTUP
-from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
 from knot_resolver.datamodel.config_schema import KresConfig
 from knot_resolver.datamodel.logging_schema import LogTargetEnum
+from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver/manager/main.py b/python/knot_resolver/manager/main.py
index bf641d6ef..673727e10 100644
--- a/python/knot_resolver/manager/main.py
+++ b/python/knot_resolver/manager/main.py
@@ -9,10 +9,8 @@ import sys
 from pathlib import Path
 from typing import NoReturn
 
-from knot_resolver.constants import VERSION
-
 from knot_resolver import compat
-from knot_resolver.constants import CONFIG_FILE_PATH_DEFAULT, CONFIG_FILE_PATH_ENV_VAR
+from knot_resolver.constants import CONFIG_FILE_PATH_DEFAULT, CONFIG_FILE_PATH_ENV_VAR, VERSION
 from knot_resolver.manager.log import logger_startup
 from knot_resolver.manager.server import start_server
 
diff --git a/python/knot_resolver/manager/server.py b/python/knot_resolver/manager/server.py
index bf94eed20..a02f4ef9f 100644
--- a/python/knot_resolver/manager/server.py
+++ b/python/knot_resolver/manager/server.py
@@ -19,27 +19,23 @@ from aiohttp.web_runner import AppRunner, TCPSite, UnixSite
 
 import knot_resolver.utils.custom_atexit as atexit
 from knot_resolver import KresBaseException
-from knot_resolver.constants import CONFIG_FILE_PATH_DEFAULT, PID_FILE_NAME
-from knot_resolver.manager import log, statistics
 from knot_resolver.compat import asyncio as asyncio_compat
-from knot_resolver.manager.config_store import ConfigStore
-from knot_resolver.manager.constants import init_user_constants
+from knot_resolver.constants import CONFIG_FILE_PATH_DEFAULT, PID_FILE_NAME
+from knot_resolver.controller import get_best_controller_implementation
+from knot_resolver.controller.exceptions import SubprocessControllerExecException
+from knot_resolver.controller.registered_workers import command_single_registered_worker
 from knot_resolver.datamodel.cache_schema import CacheClearRPCSchema
 from knot_resolver.datamodel.config_schema import KresConfig, get_rundir_without_validation
 from knot_resolver.datamodel.globals import Context, set_global_validation_context
 from knot_resolver.datamodel.management_schema import ManagementSchema
-from knot_resolver.controller import get_best_controller_implementation
-from knot_resolver.controller.exceptions import SubprocessControllerExecException
-from knot_resolver.controller.registered_workers import command_single_registered_worker
+from knot_resolver.manager import log, statistics
+from knot_resolver.manager.config_store import ConfigStore
+from knot_resolver.manager.constants import init_user_constants
 from knot_resolver.utils import ignore_exceptions_optional
 from knot_resolver.utils.async_utils import readfile
 from knot_resolver.utils.etag import structural_etag
 from knot_resolver.utils.functional import Result
-from knot_resolver.utils.modeling.exceptions import (
-    AggregateDataValidationError,
-    DataParsingError,
-    DataValidationError,
-)
+from knot_resolver.utils.modeling.exceptions import AggregateDataValidationError, DataParsingError, DataValidationError
 from knot_resolver.utils.modeling.parsing import DataFormat, try_to_parse
 from knot_resolver.utils.modeling.query import query
 from knot_resolver.utils.modeling.types import NoneType
diff --git a/python/knot_resolver/manager/statistics.py b/python/knot_resolver/manager/statistics.py
index 292a480d0..52842374d 100644
--- a/python/knot_resolver/manager/statistics.py
+++ b/python/knot_resolver/manager/statistics.py
@@ -5,12 +5,9 @@ import logging
 from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Tuple
 
 from knot_resolver import compat
-from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
+from knot_resolver.controller.registered_workers import command_registered_workers, get_registered_workers_kresids
 from knot_resolver.datamodel.config_schema import KresConfig
-from knot_resolver.controller.registered_workers import (
-    command_registered_workers,
-    get_registered_workers_kresids,
-)
+from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
 from knot_resolver.utils.functional import Result
 from knot_resolver.utils.modeling.parsing import DataFormat
 
diff --git a/python/knot_resolver/utils/modeling/query.py b/python/knot_resolver/utils/modeling/query.py
index e7c206029..2e378609e 100644
--- a/python/knot_resolver/utils/modeling/query.py
+++ b/python/knot_resolver/utils/modeling/query.py
@@ -2,7 +2,6 @@ import copy
 from abc import ABC, abstractmethod  # pylint: disable=[no-name-in-module]
 from typing import Any, List, Literal, Optional, Tuple, Union
 
-
 from knot_resolver.utils.modeling.base_schema import BaseSchema, map_object
 from knot_resolver.utils.modeling.json_pointer import json_ptr_resolve
 
diff --git a/tests/manager/datamodel/types/test_base_types.py b/tests/manager/datamodel/types/test_base_types.py
index cf6248361..210604ed9 100644
--- a/tests/manager/datamodel/types/test_base_types.py
+++ b/tests/manager/datamodel/types/test_base_types.py
@@ -5,8 +5,8 @@ from typing import List, Optional
 import pytest
 from pytest import raises
 
-from knot_resolver.datamodel.types.base_types import IntRangeBase, StringLengthBase
 from knot_resolver import KresBaseException
+from knot_resolver.datamodel.types.base_types import IntRangeBase, StringLengthBase
 
 
 @pytest.mark.parametrize("min,max", [(0, None), (None, 0), (1, 65535), (-65535, -1)])
diff --git a/tests/manager/test_config_store.py b/tests/manager/test_config_store.py
index 06bdda6c5..5ddc4e075 100644
--- a/tests/manager/test_config_store.py
+++ b/tests/manager/test_config_store.py
@@ -1,7 +1,7 @@
 import pytest
 
-from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
 from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
 
 
 @pytest.mark.asyncio  # type: ignore