diff options
| author | Andrew Scheller <github@loowis.durge.org> | 2014-04-09 19:56:38 +0100 |
|---|---|---|
| committer | Andrew Scheller <github@loowis.durge.org> | 2014-04-09 19:56:38 +0100 |
| commit | f78cfaf8b50220325dd59fa879f74a8a355f93c3 (patch) | |
| tree | a0e1c74527682c40e1bcbac34ae1a7aeef18d7d4 | |
| parent | 2bf7c092225645d8c5b15e536afdce39e3593e42 (diff) | |
| download | micropython-f78cfaf8b50220325dd59fa879f74a8a355f93c3.tar.gz micropython-f78cfaf8b50220325dd59fa879f74a8a355f93c3.zip | |
Remove exception name from inside the exception message
This prevents micropython printing exception messages like
ImportError: ImportError: No module named 'foo'
| -rw-r--r-- | py/builtinimport.c | 4 | ||||
| -rw-r--r-- | py/parsenum.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/py/builtinimport.c b/py/builtinimport.c index a3ab3c9ed7..5102a9bdec 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -77,7 +77,7 @@ void do_load(mp_obj_t module_obj, vstr_t *file) { if (lex == NULL) { // we verified the file exists using stat, but lexer could still fail - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "ImportError: No module named '%s'", vstr_str(file))); + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "No module named '%s'", vstr_str(file))); } qstr source_name = mp_lexer_source_name(lex); @@ -197,7 +197,7 @@ mp_obj_t mp_builtin___import__(uint n_args, mp_obj_t *args) { // fail if we couldn't find the file if (stat == MP_IMPORT_STAT_NO_EXIST) { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "ImportError: No module named '%s'", qstr_str(mod_name))); + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "No module named '%s'", qstr_str(mod_name))); } module_obj = mp_module_get(mod_name); diff --git a/py/parsenum.c b/py/parsenum.c index c7cf68dad9..64c8624109 100644 --- a/py/parsenum.c +++ b/py/parsenum.c @@ -19,7 +19,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str, uint len, int base) { // check radix base if ((base != 0 && base < 2) || base > 36) { - nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "ValueError: int() arg 2 must be >=2 and <= 36")); + nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "int() arg 2 must be >= 2 and <= 36")); } // skip leading space |