From 2d90ac2dd35a49a1fff42ec5c1a9189437ab0092 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20Mr=C3=A1zek?= Date: Wed, 9 Oct 2024 22:19:31 +0200 Subject: [PATCH] python: code format fixes --- python/knot_resolver/datamodel/types/types.py | 12 ++++++------ python/knot_resolver/manager/manager.py | 6 +++--- python/knot_resolver/manager/metrics/prometheus.py | 10 +++++++--- python/knot_resolver/manager/server.py | 2 -- scripts/poe-tasks/utils/create_setup.py | 2 +- .../manager/datamodel/templates/test_types_render.py | 4 ++-- tests/manager/datamodel/test_forward_schema.py | 1 - tests/manager/datamodel/types/test_custom_types.py | 8 ++++---- tests/manager/test_knot_resolver_manager.py | 1 - 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/python/knot_resolver/datamodel/types/types.py b/python/knot_resolver/datamodel/types/types.py index 1a1257208..dc3227fd9 100644 --- a/python/knot_resolver/datamodel/types/types.py +++ b/python/knot_resolver/datamodel/types/types.py @@ -208,9 +208,9 @@ class InterfacePort(StrBase): try: self.if_name = InterfaceName(parts[0]) except ValueError as e2: - raise ValueError( - f"expected IP address or interface name, got '{parts[0]}'.", object_path - ) from e1 and e2 + raise ValueError(f"expected IP address or interface name, got '{parts[0]}'.", object_path) from ( + e1 and e2 + ) self.port = PortNumber.from_str(parts[1], object_path) else: raise ValueError(f"expected '@', got '{source_value}'.", object_path) @@ -232,9 +232,9 @@ class InterfaceOptionalPort(StrBase): try: self.if_name = InterfaceName(parts[0]) except ValueError as e2: - raise ValueError( - f"expected IP address or interface name, got '{parts[0]}'.", object_path - ) from e1 and e2 + raise ValueError(f"expected IP address or interface name, got '{parts[0]}'.", object_path) from ( + e1 and e2 + ) if len(parts) == 2: self.port = PortNumber.from_str(parts[1], object_path) else: diff --git a/python/knot_resolver/manager/manager.py b/python/knot_resolver/manager/manager.py index 74d90ec32..e8be40013 100644 --- a/python/knot_resolver/manager/manager.py +++ b/python/knot_resolver/manager/manager.py @@ -233,7 +233,6 @@ class KresManager: # pylint: disable=too-many-instance-attributes await self._collect_already_running_workers() async def reset_workers_policy_rules(self, _config: KresConfig) -> None: - # command all running 'kresd' workers to reset their old policy rules, # unless the workers have already been started with a new config so reset is not needed if self._workers_reset_needed and get_registered_workers_kresids(): @@ -249,7 +248,6 @@ class KresManager: # pylint: disable=too-many-instance-attributes ) async def set_new_tls_sticket_secret(self, config: KresConfig) -> None: - if config.network.tls.sticket_secret or config.network.tls.sticket_secret_file: logger.debug("User-configured TLS resumption secret found - skipping auto-generation.") return @@ -282,7 +280,9 @@ class KresManager: # pylint: disable=too-many-instance-attributes elif self._fix_counter.is_too_high(): logger.error(f"Failed to apply config: {e}") logger.error("There have already been problems recently, refusing to try to fix it.") - await self.forced_shutdown() # possible improvement - the person who requested this change won't get a response this way + await ( + self.forced_shutdown() + ) # possible improvement - the person who requested this change won't get a response this way else: logger.error(f"Failed to apply config: {e}") logger.warning("Reloading system state and trying again.") diff --git a/python/knot_resolver/manager/metrics/prometheus.py b/python/knot_resolver/manager/metrics/prometheus.py index ba5f63343..dbdb0810b 100644 --- a/python/knot_resolver/manager/metrics/prometheus.py +++ b/python/knot_resolver/manager/metrics/prometheus.py @@ -19,11 +19,15 @@ if importlib.util.find_spec("prometheus_client"): logger = logging.getLogger(__name__) if _prometheus_client: - from prometheus_client import exposition # type: ignore from prometheus_client.bridge.graphite import GraphiteBridge # type: ignore - from prometheus_client.core import GaugeMetricFamily # type: ignore - from prometheus_client.core import REGISTRY, CounterMetricFamily, HistogramMetricFamily, Metric + from prometheus_client.core import ( + REGISTRY, + CounterMetricFamily, + GaugeMetricFamily, # type: ignore + HistogramMetricFamily, + Metric, + ) _graphite_bridge: Optional[GraphiteBridge] = None diff --git a/python/knot_resolver/manager/server.py b/python/knot_resolver/manager/server.py index 18a2aebc2..bc75c882c 100644 --- a/python/knot_resolver/manager/server.py +++ b/python/knot_resolver/manager/server.py @@ -241,7 +241,6 @@ class Server: raise web.HTTPMovedPermanently("/metrics/json") async def _handler_metrics_json(self, _request: web.Request) -> web.Response: - config = self.config_store.get() return web.Response( @@ -251,7 +250,6 @@ class Server: ) async def _handler_metrics_prometheus(self, _request: web.Request) -> web.Response: - metrics_report = await metrics.report_prometheus() if not metrics_report: raise web.HTTPNotFound() diff --git a/scripts/poe-tasks/utils/create_setup.py b/scripts/poe-tasks/utils/create_setup.py index 2240cea8f..93ff0b928 100755 --- a/scripts/poe-tasks/utils/create_setup.py +++ b/scripts/poe-tasks/utils/create_setup.py @@ -36,8 +36,8 @@ try: from poetry.core.factory import Factory from poetry.core.masonry.builders.sdist import SdistBuilder except (ImportError, ModuleNotFoundError): - from poetry.masonry.builders.sdist import SdistBuilder from poetry.factory import Factory + from poetry.masonry.builders.sdist import SdistBuilder from poetry.__version__ import __version__ except (ImportError, ModuleNotFoundError) as ee: raise ImportError(f"install poetry by doing pip install poetry to use this script: {ee}") diff --git a/tests/manager/datamodel/templates/test_types_render.py b/tests/manager/datamodel/templates/test_types_render.py index c67d72b22..22e425f9b 100644 --- a/tests/manager/datamodel/templates/test_types_render.py +++ b/tests/manager/datamodel/templates/test_types_render.py @@ -47,8 +47,8 @@ def test_escaped_str_multiline(val: Any, exp: str): ('""', r"\"\""), ("''", r"\'\'"), # fmt: off - ('\"\"', r'\"\"'), - ("\'\'", r'\'\''), + ('""', r"\"\""), + ("''", r"\'\'"), # fmt: on ], ) diff --git a/tests/manager/datamodel/test_forward_schema.py b/tests/manager/datamodel/test_forward_schema.py index 58ad4667a..3d57f93e3 100644 --- a/tests/manager/datamodel/test_forward_schema.py +++ b/tests/manager/datamodel/test_forward_schema.py @@ -36,7 +36,6 @@ def test_forward_valid(port: int, auth: bool): [(5353, True, False), (53, True, True)], ) def test_forward_invalid(port: int, auth: bool, tls: bool): - if not tls: with raises(DataValidationError): ForwardSchema( diff --git a/tests/manager/datamodel/types/test_custom_types.py b/tests/manager/datamodel/types/test_custom_types.py index e381e918e..5614fd0a2 100644 --- a/tests/manager/datamodel/types/test_custom_types.py +++ b/tests/manager/datamodel/types/test_custom_types.py @@ -130,10 +130,10 @@ def test_pin_sha256_invalid(val: str): ("\a\b\f\n\r\t\v\\", r"\a\b\f\n\r\t\v\\"), # fmt: off ("''", r"\'\'"), - ('""', r'\"\"'), - ("\'\'", r"\'\'"), - ('\"\"', r'\"\"'), - ('\\"\\"', r'\\\"\\\"'), + ('""', r"\"\""), + ("''", r"\'\'"), + ('""', r"\"\""), + ('\\"\\"', r"\\\"\\\""), ("\\'\\'", r"\\\'\\\'"), # fmt: on ], diff --git a/tests/manager/test_knot_resolver_manager.py b/tests/manager/test_knot_resolver_manager.py index 108b3b556..05d0e61dd 100644 --- a/tests/manager/test_knot_resolver_manager.py +++ b/tests/manager/test_knot_resolver_manager.py @@ -4,7 +4,6 @@ from knot_resolver import __version__ def test_version(): - with open("pyproject.toml", "r") as f: pyproject = toml.load(f) -- 2.47.2