-import unittest
from plomrogue.errors import ArgError
from plomrogue.mapping import YX
"""Parse yx_string as yx_tuple, return result.
The range_ argument may be 'nonneg' (non-negative, including
- 0) or 'pos' (positive, excluding 0).
+ 0) or 'pos' (positive, excluding 0) or 'all'.
"""
def get_axis_position_from_argument(axis, token):
- if len(token) < 3 or token[:2] != axis + ':' or \
- not (token[2:].isdigit() or token[2] == '-'):
- raise ArgError('Non-int arg for ' + axis + ' position.')
- n = int(token[2:])
- if n < 1 and range_ == 'pos':
+ if token[:2] != axis + ':':
+ raise ArgError('invalid YX tuple formatting')
+ n_string = token[2:]
+ if n_string.strip() != n_string:
+ raise ArgError('invalid YX tuple formatting')
+ try:
+ n = int(n_string)
+ except ValueError:
+ raise ArgError('non-int value for ' + axis + ' position')
+ if range_ == 'all':
+ return n
+ if n < 1 and range == 'pos':
raise ArgError('Arg for ' + axis + ' position < 1.')
elif n < 0 and range_ == 'nonneg':
raise ArgError('Arg for ' + axis + ' position < 0.')
tmpl_tokens = signature.split()
if len(tmpl_tokens) != len(args_tokens):
raise ArgError('Number of arguments (' + str(len(args_tokens)) +
- ') not expected number (' + str(len(tmpl_tokens))
- + ').')
+ ') not expected number (' + str(len(tmpl_tokens)) +
+ ').')
args = []
string_string = 'string'
for i in range(len(tmpl_tokens)):
args += [self.parse_yx_tuple(arg, 'nonneg')]
elif tmpl == 'yx_tuple:pos':
args += [self.parse_yx_tuple(arg, 'pos')]
+ elif tmpl == 'yx_tuple':
+ args += [self.parse_yx_tuple(arg, 'all')]
elif tmpl == string_string:
args += [arg]
elif tmpl[:len(string_string) + 1] == string_string + ':':