From 4a0f74897ce07635b448ed61e86ad89732007b35 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Wed, 10 Apr 2019 21:45:31 +0300 Subject: [PATCH] validators fs -> os --- kvmd/apps/__init__.py | 8 ++++---- kvmd/plugins/auth/htpasswd.py | 2 +- kvmd/validators/{fs.py => os.py} | 0 tests/{test_validators_fs.py => test_validators_os.py} | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename kvmd/validators/{fs.py => os.py} (100%) rename tests/{test_validators_fs.py => test_validators_os.py} (95%) diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py index 3a653d11..745a20e9 100644 --- a/kvmd/apps/__init__.py +++ b/kvmd/apps/__init__.py @@ -53,10 +53,10 @@ from ..validators.basic import valid_float_f01 from ..validators.auth import valid_users_list -from ..validators.fs import valid_abs_path -from ..validators.fs import valid_abs_path_exists -from ..validators.fs import valid_unix_mode -from ..validators.fs import valid_command +from ..validators.os import valid_abs_path +from ..validators.os import valid_abs_path_exists +from ..validators.os import valid_unix_mode +from ..validators.os import valid_command from ..validators.net import valid_ip_or_host from ..validators.net import valid_port diff --git a/kvmd/plugins/auth/htpasswd.py b/kvmd/plugins/auth/htpasswd.py index 099b1ae1..4c2c5e35 100644 --- a/kvmd/plugins/auth/htpasswd.py +++ b/kvmd/plugins/auth/htpasswd.py @@ -26,7 +26,7 @@ import passlib.apache from ...yamlconf import Option -from ...validators.fs import valid_abs_path_exists +from ...validators.os import valid_abs_path_exists from . import BaseAuthService diff --git a/kvmd/validators/fs.py b/kvmd/validators/os.py similarity index 100% rename from kvmd/validators/fs.py rename to kvmd/validators/os.py diff --git a/tests/test_validators_fs.py b/tests/test_validators_os.py similarity index 95% rename from tests/test_validators_fs.py rename to tests/test_validators_os.py index c2f13393..b280b4b3 100644 --- a/tests/test_validators_fs.py +++ b/tests/test_validators_os.py @@ -28,10 +28,10 @@ from typing import Any import pytest from kvmd.validators import ValidatorError -from kvmd.validators.fs import valid_abs_path -from kvmd.validators.fs import valid_abs_path_exists -from kvmd.validators.fs import valid_unix_mode -from kvmd.validators.fs import valid_command +from kvmd.validators.os import valid_abs_path +from kvmd.validators.os import valid_abs_path_exists +from kvmd.validators.os import valid_unix_mode +from kvmd.validators.os import valid_command # =====