diff options
author | Maxim Devaev <[email protected]> | 2022-09-04 18:08:40 +0300 |
---|---|---|
committer | Maxim Devaev <[email protected]> | 2022-09-04 18:08:40 +0300 |
commit | ee3e224e396494cd0d69bb6167087a071a20349c (patch) | |
tree | 5becd28570e58a03c6e1e231d0db24c264a73f88 /testenv/tests/apps | |
parent | 4b75221e9470b4a009955d7677f16adf8e23e302 (diff) |
new typing style
Diffstat (limited to 'testenv/tests/apps')
-rw-r--r-- | testenv/tests/apps/htpasswd/test_main.py | 3 | ||||
-rw-r--r-- | testenv/tests/apps/kvmd/test_auth.py | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/testenv/tests/apps/htpasswd/test_main.py b/testenv/tests/apps/htpasswd/test_main.py index 670539f2..e98281e1 100644 --- a/testenv/tests/apps/htpasswd/test_main.py +++ b/testenv/tests/apps/htpasswd/test_main.py @@ -26,7 +26,6 @@ import tempfile import builtins import getpass -from typing import List from typing import Generator from typing import Any @@ -54,7 +53,7 @@ def _htpasswd_fixture(request) -> Generator[passlib.apache.HtpasswdFile, None, N os.remove(path) -def _run_htpasswd(cmd: List[str], htpasswd_path: str, internal_type: str="htpasswd") -> None: +def _run_htpasswd(cmd: list[str], htpasswd_path: str, internal_type: str="htpasswd") -> None: cmd = ["kvmd-htpasswd", *cmd, "--set-options"] if internal_type != "htpasswd": # By default cmd.append("kvmd/auth/internal/type=" + internal_type) diff --git a/testenv/tests/apps/kvmd/test_auth.py b/testenv/tests/apps/kvmd/test_auth.py index 742e7a2c..4a9b8766 100644 --- a/testenv/tests/apps/kvmd/test_auth.py +++ b/testenv/tests/apps/kvmd/test_auth.py @@ -23,10 +23,7 @@ import os import contextlib -from typing import List -from typing import Dict from typing import AsyncGenerator -from typing import Optional import passlib.apache @@ -40,7 +37,7 @@ from kvmd.plugins.auth import get_auth_service_class # ===== -def _make_service_kwargs(path: str) -> Dict: +def _make_service_kwargs(path: str) -> dict: cls = get_auth_service_class("htpasswd") scheme = cls.get_plugin_options() return make_config({"file": path}, scheme)._unpack() @@ -50,7 +47,7 @@ def _make_service_kwargs(path: str) -> Dict: async def _get_configured_manager( internal_path: str, external_path: str="", - force_internal_users: Optional[List[str]]=None, + force_internal_users: (list[str] | None)=None, ) -> AsyncGenerator[AuthManager, None]: manager = AuthManager( |