arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 17:38:39 +00:00
Code Issues Releases Wiki Activity

tools/coin_info.py: use f-strings where appropriate

Browse Source
This commit is contained in:
matejcik 2018-08-15 17:36:24 +02:00
parent f64a090517
commit 962178fbeb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/coin_info.py
View File

@ -72,7 +72,7 @@ def check_type(val, types, nullable=False, empty=False, regex=None, choice=None)
# check type # check type
if not isinstance(val, types): if not isinstance(val, types):
raise TypeError("Wrong type (expected: {})".format(types)) raise TypeError(f"Wrong type (expected: {types})")
# check empty # check empty
if isinstance(val, (list, dict)) and not empty and not val: if isinstance(val, (list, dict)) and not empty and not val:
@ -83,11 +83,12 @@ def check_type(val, types, nullable=False, empty=False, regex=None, choice=None)
if types is not str: if types is not str:
raise TypeError("Wrong type for regex check") raise TypeError("Wrong type for regex check")
if not re.search(regex, val): if not re.search(regex, val):
raise ValueError("Value does not match regex {}".format(regex)) raise ValueError(f"Value does not match regex {regex}")
# check choice # check choice
if choice is not None and val not in choice: if choice is not None and val not in choice:
raise ValueError("Value not allowed, use one of: {}".format(", ".join(choice))) choice_str = ", ".join(choice)
raise ValueError(f"Value not allowed, use one of: {choice_str}")
def check_key(key, types, optional=False, **kwargs): def check_key(key, types, optional=False, **kwargs):
@ -96,11 +97,11 @@ def check_key(key, types, optional=False, **kwargs):
if optional: if optional:
return return
else: else:
raise KeyError("{}: Missing key".format(key)) raise KeyError(f"{key}: Missing key")
try: try:
check_type(coin[key], types, **kwargs) check_type(coin[key], types, **kwargs)
except Exception as e: except Exception as e:
raise ValueError("{}: {}".format(key, e)) from e raise ValueError(f"{key}: {e}") from e
return do_check return do_check