]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
python/knot_resolver: imports formatting
authorAleš Mrázek <ales.mrazek@nic.cz>
Thu, 29 Aug 2024 13:31:23 +0000 (15:31 +0200)
committerAleš Mrázek <ales.mrazek@nic.cz>
Fri, 6 Sep 2024 22:28:31 +0000 (00:28 +0200)
28 files changed:
python/knot_resolver/__init__.py
python/knot_resolver/client/command.py
python/knot_resolver/client/commands/convert.py
python/knot_resolver/client/commands/validate.py
python/knot_resolver/client/main.py
python/knot_resolver/constants.py
python/knot_resolver/controller/__init__.py
python/knot_resolver/controller/interface.py
python/knot_resolver/controller/supervisord/__init__.py
python/knot_resolver/controller/supervisord/config_file.py
python/knot_resolver/datamodel/config_schema.py
python/knot_resolver/datamodel/forward_schema.py
python/knot_resolver/datamodel/management_schema.py
python/knot_resolver/datamodel/network_schema.py
python/knot_resolver/datamodel/types/files.py
python/knot_resolver/datamodel/types/types.py
python/knot_resolver/datamodel/webmgmt_schema.py
python/knot_resolver/manager/__main__.py
python/knot_resolver/manager/config_store.py
python/knot_resolver/manager/constants.py
python/knot_resolver/manager/kres_manager.py
python/knot_resolver/manager/log.py
python/knot_resolver/manager/main.py
python/knot_resolver/manager/server.py
python/knot_resolver/manager/statistics.py
python/knot_resolver/utils/modeling/query.py
tests/manager/datamodel/types/test_base_types.py
tests/manager/test_config_store.py

index 4529ec6830a2b3f4b5f2c2a19dab9db7d160a57e..a91e45939e2ca98464a454b22f3d79582cb44a92 100644 (file)
@@ -1,5 +1,5 @@
-from .exceptions import KresBaseException
 from .constants import VERSION
+from .exceptions import KresBaseException
 
 __version__ = VERSION
 
index 5d1bc3c7e755bc658f8cf3dcbddec1122892bad8..da42f2cf4cf8a48e20dd6a2194525fac7a8b4f68 100644 (file)
@@ -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
index a25c5cd97d098cf67273ad102c32d1b68e9cb75c..412ed334cc5995ec8290e1f6e254150ec75e04cb 100644 (file)
@@ -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
 
index 267bf562ab5dea3cb8424cc04bb745a3e7b8ebea..f7477748145436b0323a5ea31b097b999d684eea 100644 (file)
@@ -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
 
index f48b46a9b19aa7095a910b1e0f05d956a6cfb09e..75cd6a77fe252b86c1f8a2a86afc95acb9e5aaf8 100644 (file)
@@ -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:
index f65876f1fa0b4eb9fdc67e4bebe774966e4ced9c..f63478d4a02a79314ca6293c716354a832596021 100644 (file)
@@ -1,5 +1,4 @@
 import logging
-
 from importlib.metadata import version
 from importlib.util import find_spec
 from pathlib import Path
index 2398347e0940a9a13e28abea5f987a90dcf6401b..5dc2fc554403b34b76c33c29f3d4752e57c68676 100644 (file)
@@ -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__)
 
index ba9ac28d371b3e024ef4f1cc5f3ea4afef4ade38..906592cbc742286d0b51f31dc92769c44c023c3f 100644 (file)
@@ -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__)
index b9f3cae20545933e4e5390f28d25840fce9bf0f8..b55a7ef1a288b50d12c8cd8dca22d365c788a165 100644 (file)
@@ -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
 
index f9b80f919dd8fb8a1fe23e0a76e1741d5e1efe1c..a9144505b90e35493f1171372b6f4b11983c9efa 100644 (file)
@@ -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__)
index 50d060c491fd8b08d4b642b1ca5dc090eb16416b..fa108e79c219476d56742144d00227ffaf871f35 100644 (file)
@@ -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
index 9c8cc00abc7a63ac1f45d2783d4ea295e5ca9c07..3e3af21dd643d8a1e0b221b3ee280b07a72bd3ab 100644 (file)
@@ -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
 
 
index b338c32a0c77650fc3d120c68fcac3763d12f7b6..1ad01d377bfe751c3d90e5bfe22085740f19128d 100644 (file)
@@ -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
 
 
index 2489601d0032e2f13e133baa308c6d5410ed7f57..3063cef2e9d9ce77a646605661688ee36c235d1a 100644 (file)
@@ -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
 
index 2dde21e16e5fc7097c907d0b5986e5dd404a03eb..5f46c3a174f4a13d22524bbd9202b84617a06c40 100644 (file)
@@ -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
 
index ca8706d2e2a72451a0d058b1196acdf412d31c63..1a1257208f6979705f3ad4ad2d6626c2d6e26da8 100644 (file)
@@ -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
 
 
index ce18376b8dcd7929e394aa3d52a720d0874f2ff5..c39f84d226fa87bd586e03bcfb37ffb2de77e3da 100644 (file)
@@ -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
 
 
index 26aae1d66b1c4d841eb0e353dac01f33315ae428..1063c0a51c678ecda5e1e7ee1fba9d23f8894fc3 100644 (file)
@@ -1,5 +1,4 @@
 from knot_resolver.manager.main import main
 
-
 if __name__ == "__main__":
     main()
index d783f7384e58b57f27f24d58a50b0f9f7476fa3b..08fbb71e178ffaea2e5b3acd93db0e23951bd6d9 100644 (file)
@@ -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
index c1a6688498d0b9c1b1fc544ac02e70d01b204c0e..580ac4d8e4e44ff28b4a9eeb6cb1350a0e474d57 100644 (file)
@@ -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:
index 913d872413ddbd0fee8b5818c52483395a87a89d..bf8fb9120a13e51f785d2c0405ee61822561ea17 100644 (file)
@@ -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__)
 
 
index d34e57fe9005ac8459de6c54831ec8d0bc714377..ff140dcd929d5e2b467bf55ba5ac0c1618b68e61 100644 (file)
@@ -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__)
 
index bf641d6ef4bb43e1af5846f1c98678617e772bb5..673727e102f0be7b19913192a46150f810a5c456 100644 (file)
@@ -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
 
index bf94eed20c1324cee31c223c180e61b98959db84..a02f4ef9f5a9b9e29de43fddb057a1e8ae8f00c3 100644 (file)
@@ -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
index 292a480d04563a91f30ea935cc3b98992409a4d3..52842374da35a3d4891b82c9ffdc9e9fe9f74eed 100644 (file)
@@ -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
 
index e7c20602943ae31734ac75f40ea45f7d27c6a24a..2e378609ee2c8b68064c2bcf57eafab29fcfe948 100644 (file)
@@ -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
 
index cf6248361d028cf6de132290f2da5869695f7f0a..210604ed995e47687e30068c8d527505fb47d6d9 100644 (file)
@@ -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)])
index 06bdda6c5c37ce3a8d56832815eb2728eb04dc67..5ddc4e075eef92fb5ea155981329d8a793564267 100644 (file)
@@ -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