Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
0ec6bd47
Commit
0ec6bd47
authored
Mar 09, 2014
by
Damien George
Browse files
py: Fix printing of type name.
parent
5e34909a
Changes
2
Hide whitespace changes
Inline
Side-by-side
py/objexcept.c
View file @
0ec6bd47
...
...
@@ -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
);
...
...
py/runtime.c
View file @
0ec6bd47
...
...
@@ -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
)
));
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment