merge two messages

jepler · jepler · commit f652a898e78d · 2022-11-30T12:06:17.000-06:00
diff --git a/py/argcheck.c b/py/argcheck.c
@@ -239,15 +239,15 @@ mp_obj_t mp_arg_validate_type(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_
 
 mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name) {
     if (!mp_obj_is_str(obj)) {
-        mp_raise_TypeError_varg(translate("%q must be a string"), arg_name);
+        mp_raise_TypeError_varg(translate("%q must be of type %q"), arg_name, MP_QSTR_str);
     }
     return obj;
 }
 
 mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name) {
     mp_int_t an_int;
     if (!mp_obj_get_int_maybe(obj, &an_int)) {
-        mp_raise_TypeError_varg(translate("%q must be an int"), arg_name);
+        mp_raise_TypeError_varg(translate("%q must be of type %q"), arg_name, MP_QSTR_int);
     }
     return an_int;
 }

Original file line number	Diff line number	Diff line change
`@@ -239,15 +239,15 @@ mp_obj_t mp_arg_validate_type(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_`
`239`	`239`
`240`	`240`	`mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name) {`
`241`	`241`	`if (!mp_obj_is_str(obj)) {`
`242`		`- mp_raise_TypeError_varg(translate("%q must be a string"), arg_name);`
	`242`	`+ mp_raise_TypeError_varg(translate("%q must be of type %q"), arg_name, MP_QSTR_str);`
`243`	`243`	`}`
`244`	`244`	`return obj;`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name) {`
`248`	`248`	`mp_int_t an_int;`
`249`	`249`	`if (!mp_obj_get_int_maybe(obj, &an_int)) {`
`250`		`- mp_raise_TypeError_varg(translate("%q must be an int"), arg_name);`
	`250`	`+ mp_raise_TypeError_varg(translate("%q must be of type %q"), arg_name, MP_QSTR_int);`
`251`	`251`	`}`
`252`	`252`	`return an_int;`
`253`	`253`	`}`