commit 8064892c9b894f609b270f85a15ef10f4443d714
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Wed Jan 21 23:14:46 2015 +0200
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Wed Jan 21 23:14:46 2015 +0200
tree 6121126b437841bfb78622389faa0d3a9c5f2050
parent b6e6b5277f4fb966d8090e362f187d36117b2db6

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

py/builtinimport.c

diff --git a/py/builtinimport.c b/py/builtinimport.c
index 66afdd3..73bf0b4 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -224,7 +224,8 @@
     }
 
     // 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) {
         DEBUG_printf("Module already loaded\n");
         // If it's not a package, return module right away
@@ -245,7 +246,7 @@
     #if MICROPY_MODULE_FROZEN
     mp_lexer_t *lex = mp_find_frozen_module(mod_str, mod_len);
     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);
         return module_obj;
     }