diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-09 16:29:36 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-09 16:29:36 +0000 |
| commit | 0ec6bd47cbc3549a719e3b33250d95d15944fdcb (patch) | |
| tree | 1f18051c0bd044055b3afd4b395c685746317f4d /py | |
| parent | 5e34909a12b15a8edab45c9f8f0915e2abb23b76 (diff) | |
| download | micropython-0ec6bd47cbc3549a719e3b33250d95d15944fdcb.tar.gz micropython-0ec6bd47cbc3549a719e3b33250d95d15944fdcb.zip | |
py: Fix printing of type name.
Diffstat (limited to 'py')
| -rw-r--r-- | py/objexcept.c | 2 | ||||
| -rw-r--r-- | py/runtime.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/py/objexcept.c b/py/objexcept.c index 65ec533164..532ca4320a 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -48,7 +48,7 @@ STATIC mp_obj_t mp_obj_exception_make_new(mp_obj_t type_in, uint n_args, uint n_ mp_obj_type_t *type = type_in; if (n_kw != 0) { - nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "%s does not take keyword arguments", type->name)); + nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "%s does not take keyword arguments", mp_obj_get_type_str(type_in))); } mp_obj_exception_t *o = m_new_obj_var(mp_obj_exception_t, mp_obj_t, n_args); diff --git a/py/runtime.c b/py/runtime.c index 7034ce13c0..31cbb660ad 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -474,7 +474,7 @@ mp_obj_t rt_unary_op(int op, mp_obj_t arg) { } } // TODO specify in error message what the operator is - nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "bad operand type for unary operator: '%s'", type->name)); + nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "bad operand type for unary operator: '%s'", mp_obj_get_type_str(arg))); } } @@ -721,7 +721,7 @@ mp_obj_t rt_call_function_n_kw(mp_obj_t fun_in, uint n_args, uint n_kw, const mp if (type->call != NULL) { return type->call(fun_in, n_args, n_kw, args); } else { - nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not callable", type->name)); + nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not callable", mp_obj_get_type_str(fun_in))); } } @@ -927,7 +927,7 @@ mp_obj_t rt_getiter(mp_obj_t o_in) { return mp_obj_new_getitem_iter(dest); } else { // object not iterable - nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not iterable", type->name)); + nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not iterable", mp_obj_get_type_str(o_in))); } } } @@ -937,7 +937,7 @@ mp_obj_t rt_iternext(mp_obj_t o_in) { if (type->iternext != NULL) { return type->iternext(o_in); } else { - nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not an iterator", type->name)); + nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not an iterator", mp_obj_get_type_str(o_in))); } } |