python/knot_resolver: compat module moved under utils

diff --git a/python/knot_resolver/controller/supervisord/__init__.py b/python/knot_resolver/controller/supervisord/__init__.py
index b55a7ef1a288b50d12c8cd8dca22d365c788a165..cbc181d2352fc63004cc8443f6a567a875d5b87a 100644 (file)
--- a/python/knot_resolver/controller/supervisord/__init__.py
+++ b/python/knot_resolver/controller/supervisord/__init__.py
@@ -6,7 +6,6 @@ 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.controller.exceptions import SubprocessControllerException, SubprocessControllerExecException
 from knot_resolver.controller.interface import (
     KresID,
@@ -20,6 +19,7 @@ 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
+from knot_resolver.utils.compat.asyncio import async_in_a_thread
 
 logger = logging.getLogger(__name__)
 

diff --git a/python/knot_resolver/manager/main.py b/python/knot_resolver/manager/main.py
index 7c2da663aa3c0c0acf6ae6321c494bb0607866e2..0339790b4529e417077967552ba5c1927a90e5d8 100644 (file)
--- a/python/knot_resolver/manager/main.py
+++ b/python/knot_resolver/manager/main.py
@@ -9,10 +9,10 @@ import sys
 from pathlib import Path
 from typing import NoReturn
 
-from knot_resolver import compat
 from knot_resolver.constants import CONFIG_FILE_PATH_DEFAULT, CONFIG_FILE_PATH_ENV_VAR, VERSION
 from knot_resolver.manager.logging import logger_startup
 from knot_resolver.manager.server import start_server
+from knot_resolver.utils import compat
 
 
 def parse_args() -> argparse.Namespace:

diff --git a/python/knot_resolver/manager/manager.py b/python/knot_resolver/manager/manager.py
index bf8fb9120a13e51f785d2c0405ee61822561ea17..114ad68e8882967718027af7313922597bc789a2 100644 (file)
--- a/python/knot_resolver/manager/manager.py
+++ b/python/knot_resolver/manager/manager.py
@@ -6,13 +6,13 @@ from secrets import token_hex
 from subprocess import SubprocessError
 from typing import Any, Callable, List, Optional
 
-from knot_resolver.compat.asyncio import create_task
 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.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.compat.asyncio import create_task
 from knot_resolver.utils.functional import Result
 from knot_resolver.utils.modeling.types import NoneType
 

diff --git a/python/knot_resolver/manager/server.py b/python/knot_resolver/manager/server.py
index 23fedddee7e608bcbe28f13a73b793dab2f909c0..e109cb77a6e0441ce05b402bac61d602c7823a5a 100644 (file)
--- a/python/knot_resolver/manager/server.py
+++ b/python/knot_resolver/manager/server.py
@@ -17,7 +17,6 @@ from aiohttp.web_app import Application
 from aiohttp.web_response import json_response
 from aiohttp.web_runner import AppRunner, TCPSite, UnixSite
 
-from knot_resolver.compat import asyncio as asyncio_compat
 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
@@ -30,6 +29,7 @@ from knot_resolver.manager import statistics
 from knot_resolver.utils import custom_atexit as atexit
 from knot_resolver.utils import ignore_exceptions_optional
 from knot_resolver.utils.async_utils import readfile
+from knot_resolver.utils.compat import asyncio as asyncio_compat
 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

diff --git a/python/knot_resolver/manager/statistics.py b/python/knot_resolver/manager/statistics.py
index 52842374da35a3d4891b82c9ffdc9e9fe9f74eed..1dac843dfb564e333dbfaafbf66b1b656a79d7d4 100644 (file)
--- a/python/knot_resolver/manager/statistics.py
+++ b/python/knot_resolver/manager/statistics.py
@@ -4,10 +4,10 @@ import json
 import logging
 from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Tuple
 
-from knot_resolver import compat
 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.manager.config_store import ConfigStore, only_on_real_changes_update
+from knot_resolver.utils import compat
 from knot_resolver.utils.functional import Result
 from knot_resolver.utils.modeling.parsing import DataFormat
 

diff --git a/python/knot_resolver/utils/async_utils.py b/python/knot_resolver/utils/async_utils.py
index a5acdbd515661c86b5589143675407938a5f540b..c530c68be205764a85cf270e9abe2fd850fac031 100644 (file)
--- a/python/knot_resolver/utils/async_utils.py
+++ b/python/knot_resolver/utils/async_utils.py
@@ -9,7 +9,7 @@ from pathlib import PurePath
 from threading import Thread
 from typing import Any, Dict, Generic, List, Optional, TypeVar, Union
 
-from knot_resolver.compat.asyncio import to_thread
+from knot_resolver.utils.compat.asyncio import to_thread
 
 
 def unblock_signals():

diff --git a/python/knot_resolver/compat/__init__.py b/python/knot_resolver/utils/compat/__init__.py
similarity index 100%
rename from python/knot_resolver/compat/__init__.py
rename to python/knot_resolver/utils/compat/__init__.py

diff --git a/python/knot_resolver/compat/asyncio.py b/python/knot_resolver/utils/compat/asyncio.py
similarity index 100%
rename from python/knot_resolver/compat/asyncio.py
rename to python/knot_resolver/utils/compat/asyncio.py

diff --git a/setup.py b/setup.py
index b17ebe8801b245664e31d05c32c6cf45500107fe..904ded57d336917729c7d5163c210410bcf7a8a4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,6 @@ packages = \
 ['knot_resolver',
  'knot_resolver.client',
  'knot_resolver.client.commands',
- 'knot_resolver.compat',
  'knot_resolver.controller',
  'knot_resolver.controller.supervisord',
  'knot_resolver.controller.supervisord.plugin',
@@ -17,6 +16,7 @@ packages = \
  'knot_resolver.datamodel.types',
  'knot_resolver.manager',
  'knot_resolver.utils',
+ 'knot_resolver.utils.compat',
  'knot_resolver.utils.modeling']
 
 package_data = \