GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

f-strings

Browse Source
This commit is contained in:
Devaev Maxim
2019-06-28 18:59:36 +03:00
parent ff270591b0
commit ef3c62a7af
15 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kvmd/validators/__init__.py
View File

@@ -40,13 +40,13 @@ class ValidatorError(ValueError):
def raise_error(arg: Any, name: str, hide: bool=False) -> NoReturn:
arg_str = " "
if not hide:
arg_str = (" %r " if isinstance(arg, (str, bytes)) else " '%s' ") % (arg)
raise ValidatorError("The argument" + arg_str + "is not a valid " + name)
arg_str = (f" {arg!r} " if isinstance(arg, (str, bytes)) else f" '{arg}' ")
raise ValidatorError(f"The argument{arg_str}is not a valid {name}")
def check_not_none(arg: Any, name: str) -> Any:
if arg is None:
raise ValidatorError("Empty argument is not a valid %s" % (name))
raise ValidatorError(f"Empty argument is not a valid {name}")
return arg

8
kvmd/validators/basic.py
View File

@@ -40,7 +40,7 @@ def valid_bool(arg: Any) -> bool:
true_args = ["1", "true", "yes"]
false_args = ["0", "false", "no"]
name = "bool (%r or %r)" % (true_args, false_args)
name = f"bool ({true_args!r} or {false_args!r})"
arg = check_not_none_string(arg, name).lower()
arg = check_in_list(arg, name, true_args + false_args)
@@ -64,9 +64,9 @@ def valid_number(
raise_error(arg, name)
if min is not None and arg < min:
raise ValidatorError("The argument '%s' must be %s and greater or equial than %s" % (arg, name, min))
raise ValidatorError(f"The argument '{arg}' must be {name} and greater or equial than {min}")
if max is not None and arg > max:
raise ValidatorError("The argument '%s' must be %s and lesser or equal then %s" % (arg, name, max))
raise ValidatorError(f"The argument '{arg}' must be {name} and lesser or equal then {max}")
return arg
@@ -98,5 +98,5 @@ def valid_string_list(
try:
arg = list(map(subval, arg))
except Exception:
raise ValidatorError("Failed sub-validator on one of the item of %r" % (arg))
raise ValidatorError(f"Failed sub-validator on one of the item of {arg!r}")
return arg