diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-09 23:31:30 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-09 23:31:30 +0100 |
| commit | 87bb093eb65b45870b4806febbdf17bb348c440f (patch) | |
| tree | 4fb3d28d45e23867b13ffa14fb4b32481fd870b3 /py | |
| parent | 7a5f9e94ad787c7a1d10bba3af2d4c79bc39e54c (diff) | |
| parent | 1d2ba5ddf94accde1c46bc8504990ba8ac3680e6 (diff) | |
| download | micropython-87bb093eb65b45870b4806febbdf17bb348c440f.tar.gz micropython-87bb093eb65b45870b4806febbdf17bb348c440f.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py')
| -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 |