djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtinimport: Make sure that qstr is used properly to load frozen modules.

This commit is contained in:
Paul Sokolovsky 2015-01-21 23:14:46 +02:00
parent b6e6b5277f
commit 8064892c9b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
py/builtinimport.c
View File

@ -224,7 +224,8 @@ mp_obj_t mp_builtin___import__(mp_uint_t n_args, const mp_obj_t *args) {
} }
// check if module already exists // check if module already exists
mp_obj_t module_obj = mp_module_get(mp_obj_str_get_qstr(module_name)); qstr module_name_qstr = mp_obj_str_get_qstr(module_name);
mp_obj_t module_obj = mp_module_get(module_name_qstr);
if (module_obj != MP_OBJ_NULL) { if (module_obj != MP_OBJ_NULL) {
DEBUG_printf("Module already loaded\n"); DEBUG_printf("Module already loaded\n");
// If it's not a package, return module right away // If it's not a package, return module right away
@ -245,7 +246,7 @@ mp_obj_t mp_builtin___import__(mp_uint_t n_args, const mp_obj_t *args) {
#if MICROPY_MODULE_FROZEN #if MICROPY_MODULE_FROZEN
mp_lexer_t *lex = mp_find_frozen_module(mod_str, mod_len); mp_lexer_t *lex = mp_find_frozen_module(mod_str, mod_len);
if (lex != NULL) { if (lex != NULL) {
module_obj = mp_obj_new_module(MP_OBJ_QSTR_VALUE(module_name)); module_obj = mp_obj_new_module(module_name_qstr);
do_load_from_lexer(module_obj, lex, mod_str); do_load_from_lexer(module_obj, lex, mod_str);
return module_obj; return module_obj;
} }