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

Merge branch 'fix_str_call' of github.com:msiemens/micropython into msiemens-fix_str_call

Browse Source
This commit is contained in:
Damien George 2014-01-31 23:47:52 +00:00
commit f3b05449cc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/runtime.c
View File

@ -739,6 +739,8 @@ mp_obj_t rt_call_function_n_kw(mp_obj_t fun_in, uint n_args, uint n_kw, const mp
if (MP_OBJ_IS_SMALL_INT(fun_in)) {
nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "'int' object is not callable"));
} else if(MP_OBJ_IS_STR(fun_in)) {
nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "'str' object is not callable"));
} else {
mp_obj_base_t *fun = fun_in;
if (fun->type->call != NULL) {