Merge branch 'master' of github.com:micropython/micropython

dpgeorge · dpgeorge · commit 87bb093eb65b · 2014-04-09T23:31:30.000+01:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ void do_load(mp_obj_t module_obj, vstr_t *file) {`
`77`	`77`
`78`	`78`	`if (lex == NULL) {`
`79`	`79`	`// we verified the file exists using stat, but lexer could still fail`
`80`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "ImportError: No module named '%s'", vstr_str(file)));`
	`80`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "No module named '%s'", vstr_str(file)));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`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) {`
`197`	`197`
`198`	`198`	`// fail if we couldn't find the file`
`199`	`199`	`if (stat == MP_IMPORT_STAT_NO_EXIST) {`
`200`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "ImportError: No module named '%s'", qstr_str(mod_name)));`
	`200`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "No module named '%s'", qstr_str(mod_name)));`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`module_obj = mp_module_get(mod_name);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str, uint len, int base) {`
`19`	`19`
`20`	`20`	`// check radix base`
`21`	`21`	`if ((base != 0 && base < 2) \|\| base > 36) {`
`22`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "ValueError: int() arg 2 must be >=2 and <= 36"));`
	`22`	`+ nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "int() arg 2 must be >= 2 and <= 36"));`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`// skip leading space`