X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fparser.py;h=302733d0322a69c9592276b94239b626debcb4c3;hb=0f924e175d0f321e703e3f00511b547c4a027dbc;hp=22e90594be8313ab514d6d346ce1b87fa498188b;hpb=c1024023126d1fd91be3145e50cae4b493d7a956;p=plomrogue2 diff --git a/plomrogue/parser.py b/plomrogue/parser.py index 22e9059..302733d 100644 --- a/plomrogue/parser.py +++ b/plomrogue/parser.py @@ -84,7 +84,7 @@ class Parser: import string msg = msg.replace('\n', ' ') # Inserted by some tablet keyboards. legal_chars = string.digits + string.ascii_letters +\ - string.punctuation + ' ' + 'ÄäÖöÜüߧ' + 'éèáàô' + string.punctuation + ' ' + 'ÄäÖöÜüߧ' + 'éèáàô' + '–…' for c in msg: if not c in legal_chars: raise ArgError('Command/message contains illegal character(s), ' @@ -127,6 +127,11 @@ class Parser: if not arg.isdigit() or int(arg) < 1: raise ArgError('Argument must be positive integer.') args += [int(arg)] + elif tmpl == 'int': + try: + args += [int(arg)] + except ValueError: + raise ArgError('Argument must be integer.') elif tmpl == 'bool': if not arg.isdigit() or int(arg) not in (0, 1): raise ArgError('Argument must be 0 or 1.')