python: code format fixes

diff --git a/python/knot_resolver/datamodel/types/types.py b/python/knot_resolver/datamodel/types/types.py
index 1a1257208f6979705f3ad4ad2d6626c2d6e26da8..dc3227fd97c0b996a974c8c02482b564dc8e0268 100644 (file)
--- 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 '<ip-address|interface-name>@<port>', 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 74d90ec32d8b24a0713c8e64c89bdb9bdf1ed34e..e8be4001391b530b2f7fc386c54bc2907ed04d99 100644 (file)
--- 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 ba5f63343caba79752b4bbbb4d837dfa7923e6f8..dbdb0810b7388b4eb4a2cf03fc567711f748f8ce 100644 (file)
--- 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 18a2aebc247d241c2c5d533a4fc05e189d469d9f..bc75c882c4654c0df9f5b31007a3b29296fb36d2 100644 (file)
--- 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 2240cea8f662f3e60140bc41bb5135ff7ed6a317..93ff0b928e0859d143e36fd4cf9f75fc5b269cac 100755 (executable)
--- 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 c67d72b224f766f2c2347f8af25c2dffa8d384a9..22e425f9bbfeaa7b65be8769e8580c9adfd96622 100644 (file)
--- 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 58ad4667a6f5fb322ad0147d659717930a2b3d8b..3d57f93e3cb7b52b0324ba06df54c67a562e84d5 100644 (file)
--- 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 e381e918eedd138d00532082e9ae4a354ddfc006..5614fd0a24e6fe1a9f90163926c150a822aa95ea 100644 (file)
--- 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 108b3b55680ec4053c988299adabef8eeca98460..05d0e61dd3555286826cc80139b5861448b875ce 100644 (file)
--- 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)