StackRduino
diff --git a/‎py/objexcept.c‎
Lines changed: 1 addition & 1 deletion b/‎py/objexcept.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎py/runtime.c‎
Lines changed: 4 additions & 4 deletions b/‎py/runtime.c‎
Lines changed: 4 additions & 4 deletions
@@ -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);
 
@@ -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)));
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_obj_exception_make_new(mp_obj_t type_in, uint n_args, uint n_`
`48`	`48`	`mp_obj_type_t *type = type_in;`
`49`	`49`
`50`	`50`	`if (n_kw != 0) {`
`51`		`- nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "%s does not take keyword arguments", type->name));`
	`51`	`+ nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "%s does not take keyword arguments", mp_obj_get_type_str(type_in)));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`mp_obj_exception_t *o = m_new_obj_var(mp_obj_exception_t, mp_obj_t, n_args);`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ mp_obj_t rt_unary_op(int op, mp_obj_t arg) {`
`474`	`474`	`}`
`475`	`475`	`}`
`476`	`476`	`// TODO specify in error message what the operator is`
`477`		`- nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "bad operand type for unary operator: '%s'", type->name));`
	`477`	`+ nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "bad operand type for unary operator: '%s'", mp_obj_get_type_str(arg)));`
`478`	`478`	`}`
`479`	`479`	`}`
`480`	`480`
`@@ -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`
`721`	`721`	`if (type->call != NULL) {`
`722`	`722`	`return type->call(fun_in, n_args, n_kw, args);`
`723`	`723`	`} else {`
`724`		`- nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not callable", type->name));`
	`724`	`+ nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not callable", mp_obj_get_type_str(fun_in)));`
`725`	`725`	`}`
`726`	`726`	`}`
`727`	`727`
`@@ -927,7 +927,7 @@ mp_obj_t rt_getiter(mp_obj_t o_in) {`
`927`	`927`	`return mp_obj_new_getitem_iter(dest);`
`928`	`928`	`} else {`
`929`	`929`	`// object not iterable`
`930`		`- nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not iterable", type->name));`
	`930`	`+ nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not iterable", mp_obj_get_type_str(o_in)));`
`931`	`931`	`}`
`932`	`932`	`}`
`933`	`933`	`}`
`@@ -937,7 +937,7 @@ mp_obj_t rt_iternext(mp_obj_t o_in) {`
`937`	`937`	`if (type->iternext != NULL) {`
`938`	`938`	`return type->iternext(o_in);`
`939`	`939`	`} else {`
`940`		`- nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not an iterator", type->name));`
	`940`	`+ nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object is not an iterator", mp_obj_get_type_str(o_in)));`
`941`	`941`	`}`
`942`	`942`	`}`
`943`	`943`