f-strings

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

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