all: Use MP_ERROR_TEXT for all error messages.

1 files changed, 9 insertions, 9 deletions

diff --git a/py/argcheck.c b/py/argcheck.c
index 88c4b8bf3..c333ead05 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -41,7 +41,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
         #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #else
-        mp_raise_TypeError("function doesn't take keyword arguments");
+        mp_raise_TypeError(MP_ERROR_TEXT("function doesn't take keyword arguments"));
         #endif
     }
 
@@ -51,7 +51,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
-                "function takes %d positional arguments but %d were given",
+                MP_ERROR_TEXT("function takes %d positional arguments but %d were given"),
                 n_args_min, n_args);
             #endif
         }
@@ -61,7 +61,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
-                "function missing %d required positional arguments",
+                MP_ERROR_TEXT("function missing %d required positional arguments"),
                 n_args_min - n_args);
             #endif
         } else if (n_args > n_args_max) {
@@ -69,7 +69,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
-                "function expected at most %d arguments, got %d",
+                MP_ERROR_TEXT("function expected at most %d arguments, got %d"),
                 n_args_max, n_args);
             #endif
         }
@@ -93,7 +93,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
                     #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
                     mp_arg_error_terse_mismatch();
                     #else
-                    mp_raise_msg_varg(&mp_type_TypeError, "'%q' argument required", allowed[i].qst);
+                    mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("'%q' argument required"), allowed[i].qst);
                     #endif
                 }
                 out_vals[i] = allowed[i].defval;
@@ -118,7 +118,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
         mp_arg_error_terse_mismatch();
         #else
         // TODO better error message
-        mp_raise_TypeError("extra positional arguments given");
+        mp_raise_TypeError(MP_ERROR_TEXT("extra positional arguments given"));
         #endif
     }
     if (kws_found < kws->used) {
@@ -126,7 +126,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
         mp_arg_error_terse_mismatch();
         #else
         // TODO better error message
-        mp_raise_TypeError("extra keyword arguments given");
+        mp_raise_TypeError(MP_ERROR_TEXT("extra keyword arguments given"));
         #endif
     }
 }
@@ -138,11 +138,11 @@ void mp_arg_parse_all_kw_array(size_t n_pos, size_t n_kw, const mp_obj_t *args,
 }
 
 NORETURN void mp_arg_error_terse_mismatch(void) {
-    mp_raise_TypeError("argument num/types mismatch");
+    mp_raise_TypeError(MP_ERROR_TEXT("argument num/types mismatch"));
 }
 
 #if MICROPY_CPYTHON_COMPAT
 NORETURN void mp_arg_error_unimpl_kw(void) {
-    mp_raise_NotImplementedError("keyword argument(s) not yet implemented - use normal args instead");
+    mp_raise_NotImplementedError(MP_ERROR_TEXT("keyword argument(s) not yet implemented - use normal args instead"));
 }
 #endif