Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-05 03:30:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

py/builtinimport: Guard code needing sys.path with MICROPY_PY_SYS_PATH.

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2025-08-15 14:17:09 +10:00
parent b5fcb33eaa
commit 14e9c00cb9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
py/builtinimport.c
View File

@@ -116,7 +116,7 @@ static mp_import_stat_t stat_module(vstr_t *path) {
// path (i.e. "<entry>/mod_name(.py)"). // path (i.e. "<entry>/mod_name(.py)").
static mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) { static mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {
DEBUG_printf("stat_top_level: '%s'\n", qstr_str(mod_name)); DEBUG_printf("stat_top_level: '%s'\n", qstr_str(mod_name));
#if MICROPY_PY_SYS #if MICROPY_PY_SYS && MICROPY_PY_SYS_PATH
size_t path_num; size_t path_num;
mp_obj_t *path_items; mp_obj_t *path_items;
mp_obj_get_array(mp_sys_path, &path_num, &path_items); mp_obj_get_array(mp_sys_path, &path_num, &path_items);
@@ -367,7 +367,7 @@ static mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
// Immediately return if the module at this level is already loaded. // Immediately return if the module at this level is already loaded.
mp_map_elem_t *elem; mp_map_elem_t *elem;
#if MICROPY_PY_SYS #if MICROPY_PY_SYS && MICROPY_PY_SYS_PATH
// If sys.path is empty, the intention is to force using a built-in. This // If sys.path is empty, the intention is to force using a built-in. This
// means we should also ignore any loaded modules with the same name // means we should also ignore any loaded modules with the same name
// which may have come from the filesystem. // which may have come from the filesystem.