diff options
| author | Damien George <damien@micropython.org> | 2021-12-21 23:07:00 +1100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-12-29 23:55:36 +1100 |
| commit | aac5a97d08f9f28b7c3f170d007be0b538349937 (patch) | |
| tree | 24026a4cfc16ed350e1669864278feddde5cd018 /py/runtime.c | |
| parent | 028776d97b284d2fda053dd7daa4c72591f0115e (diff) | |
ports: Move '.frozen' to second entry in sys.path.
In commit 86ce4426079b1b368881c22f46d80045e2f720b0 the '.frozen' entry was
added at the start of sys.path, to allow control over when frozen modules
are searched during import, and retain existing behaviour whereby frozen
was searched before the filesystem.
But Python semantics of sys.path require sys.path[0] to be the directory of
the currently executing script, or ''.
This commit moves the '.frozen' entry to second place in sys.path, so
sys.path[0] retains its correct value (described above).
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'py/runtime.c')
| -rw-r--r-- | py/runtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/runtime.c b/py/runtime.c index 7607ffb19..8c93f539e 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -124,10 +124,10 @@ void mp_init(void) { #if MICROPY_PY_SYS_PATH_ARGV_DEFAULTS mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0); + mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script) #if MICROPY_MODULE_FROZEN mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen)); #endif - mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script) mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0); #endif |