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

fix os.listdir() when current dir is '/'

Browse Source
This commit is contained in:
Dan Halbert 2018-06-15 10:51:03 -04:00
parent 720042f964
commit 327b0f76da
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared-bindings/os/__init__.c
View File

@ -87,7 +87,7 @@ mp_obj_t os_listdir(size_t n_args, const mp_obj_t *args) {
if (n_args == 1) { if (n_args == 1) {
path = mp_obj_str_get_str(args[0]); path = mp_obj_str_get_str(args[0]);
} else { } else {
path = ""; path = mp_obj_str_get_str(common_hal_os_getcwd());
} }
return common_hal_os_listdir(path); return common_hal_os_listdir(path);
} }

2
shared-module/os/__init__.c
View File

@ -103,7 +103,7 @@ mp_obj_t common_hal_os_listdir(const char* path) {
iter.base.type = &mp_type_polymorph_iter; iter.base.type = &mp_type_polymorph_iter;
iter.iternext = mp_vfs_ilistdir_it_iternext; iter.iternext = mp_vfs_ilistdir_it_iternext;
iter.cur.vfs = MP_STATE_VM(vfs_mount_table); iter.cur.vfs = MP_STATE_VM(vfs_mount_table);
iter.is_str = mp_obj_get_type(path) == &mp_type_str; iter.is_str = true;
iter.is_iter = false; iter.is_iter = false;
} else { } else {
iter_obj = mp_vfs_proxy_call(vfs, MP_QSTR_ilistdir, 1, &path_out); iter_obj = mp_vfs_proxy_call(vfs, MP_QSTR_ilistdir, 1, &path_out);