1 files changed, 11 insertions, 2 deletions
diff --git a/py/parsenum.c b/py/parsenum.c
index c6174db65a..1a39c899d5 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -147,9 +147,18 @@ value_error:
         mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_ValueError,
             "invalid syntax for integer");
         raise_exc(exc, lex);
-    } else {
+    } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL) {
         mp_obj_t exc = mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-            "invalid syntax for integer with base %d: '%.*s'", base, top - str_val_start, str_val_start);
+            "invalid syntax for integer with base %d", base);
+        raise_exc(exc, lex);
+    } else {
+        vstr_t vstr;
+        mp_print_t print;
+        vstr_init_print(&vstr, 50, &print);
+        mp_printf(&print, "invalid syntax for integer with base %d: ", base);
+        mp_str_print_quoted(&print, str_val_start, top - str_val_start, true);
+        mp_obj_t exc = mp_obj_new_exception_arg1(&mp_type_ValueError,
+            mp_obj_new_str_from_vstr(&mp_type_str, &vstr));
         raise_exc(exc, lex);
     }
 }