mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py/builtinimport: Adjust if-block order in find_file to clean up #if's.

This commit is contained in:
Damien George 2020-02-26 15:31:13 +11:00
parent 2b50afaee4
commit a642241a12
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
py/builtinimport.c
View File

@ -102,13 +102,7 @@ STATIC mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *d
mp_obj_t *path_items; mp_obj_t *path_items;
mp_obj_list_get(mp_sys_path, &path_num, &path_items); mp_obj_list_get(mp_sys_path, &path_num, &path_items);
if (path_num == 0) { if (path_num != 0) {
#endif
// mp_sys_path is empty, so just use the given file name
vstr_add_strn(dest, file_str, file_len);
return stat_dir_or_file(dest);
#if MICROPY_PY_SYS
} else {
// go through each path looking for a directory or file // go through each path looking for a directory or file
for (size_t i = 0; i < path_num; i++) { for (size_t i = 0; i < path_num; i++) {
vstr_reset(dest); vstr_reset(dest);
@ -129,6 +123,10 @@ STATIC mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *d
return MP_IMPORT_STAT_NO_EXIST; return MP_IMPORT_STAT_NO_EXIST;
} }
#endif #endif
// mp_sys_path is empty, so just use the given file name
vstr_add_strn(dest, file_str, file_len);
return stat_dir_or_file(dest);
} }
#if MICROPY_MODULE_FROZEN_STR || MICROPY_ENABLE_COMPILER #if MICROPY_MODULE_FROZEN_STR || MICROPY_ENABLE_COMPILER