Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: revert to try/except and replace TypeError

Browse source
This commit is contained in:
Mike Gray 2022-10-31 20:35:22 -05:00
parent 8934579cda
commit bafa9f05bb
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
evennia/utils/funcparser.py
View file

@ -657,8 +657,9 @@ def funcparser_callable_eval(*args, **kwargs):
def funcparser_callable_toint(*args, **kwargs): def funcparser_callable_toint(*args, **kwargs):
"""Usage: $toint(43.0) -> 43""" """Usage: $toint(43.0) -> 43"""
inp = funcparser_callable_eval(*args, **kwargs) inp = funcparser_callable_eval(*args, **kwargs)
if isinstance(inp, str) and inp.isnumeric(): try:
inp = int(inp) return int(inp)
except ValueError:
return inp return inp
@ -673,9 +674,10 @@ def funcparser_callable_int2str(*args, **kwargs):
""" """
if not args: if not args:
return "" return ""
number = args[0] try:
if isinstance(args[0], str) and args[0].isnumeric():
number = int(args[0]) number = int(args[0])
except ValueError:
return args[0]
return int2str(number) return int2str(number)
@ -898,9 +900,10 @@ def funcparser_callable_pad(*args, **kwargs):
text, *rest = args text, *rest = args
nrest = len(rest) nrest = len(rest)
width = kwargs.get("width", rest[0] if nrest > 0 else _CLIENT_DEFAULT_WIDTH) try:
if isinstance(width, str) and width.isnumeric(): width = int(kwargs.get("width", rest[0] if nrest > 0 else _CLIENT_DEFAULT_WIDTH))
width = int(width) except ValueError:
width = _CLIENT_DEFAULT_WIDTH
align = kwargs.get("align", rest[1] if nrest > 1 else "c") align = kwargs.get("align", rest[1] if nrest > 1 else "c")
fillchar = kwargs.get("fillchar", rest[2] if nrest > 2 else " ") fillchar = kwargs.get("fillchar", rest[2] if nrest > 2 else " ")
@ -929,9 +932,10 @@ def funcparser_callable_crop(*args, **kwargs):
return "" return ""
text, *rest = args text, *rest = args
nrest = len(rest) nrest = len(rest)
width = kwargs.get("width", rest[0] if nrest > 0 else _CLIENT_DEFAULT_WIDTH) try:
if isinstance(width, str) and width.isnumeric(): width = int(kwargs.get("width", rest[0] if nrest > 0 else _CLIENT_DEFAULT_WIDTH))
width = int(width) except ValueError:
width = _CLIENT_DEFAULT_WIDTH
suffix = kwargs.get("suffix", rest[1] if nrest > 1 else "[...]") suffix = kwargs.get("suffix", rest[1] if nrest > 1 else "[...]")
return crop(str(text), width=width, suffix=str(suffix)) return crop(str(text), width=width, suffix=str(suffix))
@ -945,9 +949,10 @@ def funcparser_callable_space(*args, **kwarg):
""" """
if not args: if not args:
return "" return ""
width = args[0] try:
if isinstance(width, str) and width.isnumeric(): width = int(args[0])
width = int(width) except ValueError:
width = 1
return " " * width return " " * width
@ -975,12 +980,12 @@ def funcparser_callable_justify(*args, **kwargs):
lrest = len(rest) lrest = len(rest)
try: try:
width = int(kwargs.get("width", rest[0] if lrest > 0 else _CLIENT_DEFAULT_WIDTH)) width = int(kwargs.get("width", rest[0] if lrest > 0 else _CLIENT_DEFAULT_WIDTH))
except TypeError: except ValueError:
width = _CLIENT_DEFAULT_WIDTH width = _CLIENT_DEFAULT_WIDTH
align = str(kwargs.get("align", rest[1] if lrest > 1 else "f")) align = str(kwargs.get("align", rest[1] if lrest > 1 else "f"))
try: try:
indent = int(kwargs.get("indent", rest[2] if lrest > 2 else 0)) indent = int(kwargs.get("indent", rest[2] if lrest > 2 else 0))
except TypeError: except ValueError:
indent = 0 indent = 0
return justify(str(text), width=width, align=align, indent=indent) return justify(str(text), width=width, align=align, indent=indent)