diff --git a/evennia/utils/funcparser.py b/evennia/utils/funcparser.py index 086cfd2bd9..70c79fe1e7 100644 --- a/evennia/utils/funcparser.py +++ b/evennia/utils/funcparser.py @@ -661,6 +661,8 @@ def funcparser_callable_toint(*args, **kwargs): return int(inp) except TypeError: return inp + except ValueError: + return inp def funcparser_callable_int2str(*args, **kwargs): @@ -902,7 +904,7 @@ def funcparser_callable_pad(*args, **kwargs): nrest = len(rest) try: width = int(kwargs.get("width", rest[0] if nrest > 0 else _CLIENT_DEFAULT_WIDTH)) - except TypeError: + except ValueError: width = _CLIENT_DEFAULT_WIDTH align = kwargs.get("align", rest[1] if nrest > 1 else "c") @@ -934,7 +936,7 @@ def funcparser_callable_crop(*args, **kwargs): nrest = len(rest) try: width = int(kwargs.get("width", rest[0] if nrest > 0 else _CLIENT_DEFAULT_WIDTH)) - except TypeError: + except ValueError: width = _CLIENT_DEFAULT_WIDTH suffix = kwargs.get("suffix", rest[1] if nrest > 1 else "[...]") return crop(str(text), width=width, suffix=str(suffix)) @@ -951,7 +953,7 @@ def funcparser_callable_space(*args, **kwarg): return "" try: width = int(args[0]) - except TypeError: + except ValueError: width = 1 return " " * width @@ -980,12 +982,12 @@ def funcparser_callable_justify(*args, **kwargs): lrest = len(rest) try: width = int(kwargs.get("width", rest[0] if lrest > 0 else _CLIENT_DEFAULT_WIDTH)) - except TypeError: + except ValueError: width = _CLIENT_DEFAULT_WIDTH align = str(kwargs.get("align", rest[1] if lrest > 1 else "f")) try: indent = int(kwargs.get("indent", rest[2] if lrest > 2 else 0)) - except TypeError: + except ValueError: indent = 0 return justify(str(text), width=width, align=align, indent=indent)