djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Small change to mp_arg_parse_all.

Browse Source
This commit is contained in:
Damien George 2014-04-21 00:09:44 +01:00
parent 643284fc8e
commit 64ba6ca127
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/argcheck.c
View File

@ -40,7 +40,7 @@ void mp_arg_parse_all(uint n_pos, const mp_obj_t *pos, mp_map_t *kws, uint n_all
mp_obj_t given_arg; mp_obj_t given_arg;
if (i < n_pos) { if (i < n_pos) {
if (allowed[i].flags & MP_ARG_PARSE_KW_ONLY) { if (allowed[i].flags & MP_ARG_PARSE_KW_ONLY) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' argument must be given by a keyword", qstr_str(allowed[i].qstr))); goto extra_positional;
} }
pos_found++; pos_found++;
given_arg = pos[i]; given_arg = pos[i];
@ -69,6 +69,7 @@ void mp_arg_parse_all(uint n_pos, const mp_obj_t *pos, mp_map_t *kws, uint n_all
} }
if (pos_found < n_pos) { if (pos_found < n_pos) {
// TODO better error message // TODO better error message
extra_positional:
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "extra positional arguments given")); nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "extra positional arguments given"));
} }
if (kws_found < kws->used) { if (kws_found < kws->used) {