From c5be4db586c52efc521eea5b81423b76a5f28c7e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20Mr=C3=A1zek?= Date: Thu, 17 Jul 2025 09:48:59 +0200 Subject: [PATCH] nit: datamodel: fix formatting --- python/knot_resolver/datamodel/local_data_schema.py | 4 ++-- python/knot_resolver/datamodel/types/files.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/python/knot_resolver/datamodel/local_data_schema.py b/python/knot_resolver/datamodel/local_data_schema.py index 782142ed2..12a59301e 100644 --- a/python/knot_resolver/datamodel/local_data_schema.py +++ b/python/knot_resolver/datamodel/local_data_schema.py @@ -71,7 +71,7 @@ class RPZSchema(ConfigSchema): watchdog: Union[Literal["auto"], bool] = "auto" tags: Optional[List[IDPattern]] = None log: Optional[List[Literal["ip", "name"]]] = None - #dry_run: bool = False + # dry_run: bool = False _LAYER = Raw @@ -79,7 +79,7 @@ class RPZSchema(ConfigSchema): watchdog: bool tags: Optional[List[IDPattern]] log: Optional[List[Literal["ip", "name"]]] - #dry_run: bool + # dry_run: bool def _watchdog(self, obj: Raw) -> Any: if obj.watchdog == "auto": diff --git a/python/knot_resolver/datamodel/types/files.py b/python/knot_resolver/datamodel/types/files.py index b19237fa2..1e7cea040 100644 --- a/python/knot_resolver/datamodel/types/files.py +++ b/python/knot_resolver/datamodel/types/files.py @@ -160,6 +160,7 @@ class _PermissionMode(Flag): WRITE = auto() EXECUTE = auto() + def _check_permission(dest_path: Path, perm_mode: _PermissionMode) -> bool: chflags = { _PermissionMode.READ: [stat.S_IRUSR, stat.S_IRGRP, stat.S_IROTH], @@ -262,9 +263,7 @@ class WritableFilePath(FilePath): logger.info(f"{msg}, but the resolver can somehow (ACLs, ...) write to the directory") # check that existing file is writable - if self._value.exists() and not _check_permission( - self._value, _PermissionMode.WRITE - ): + if self._value.exists() and not _check_permission(self._value, _PermissionMode.WRITE): msg = f"{USER}:{GROUP} has insufficient permissions to write/execute '{self._value}'" if not os.access(self._value, os.W_OK): raise ValueError(msg) -- 2.47.2