Merge pull request adafruit#932 from dhalbert/listdir_root

tannewt · web-flow · commit 5ce1d7120640 · 2018-06-15T09:34:08.000-07:00
fix os.listdir() when current dir is '/'
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
@@ -87,7 +87,7 @@ mp_obj_t os_listdir(size_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         path = mp_obj_str_get_str(args[0]);
     } else {
-        path = "";
+        path = mp_obj_str_get_str(common_hal_os_getcwd());
     }
     return common_hal_os_listdir(path);
 }
diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c
@@ -103,7 +103,7 @@ mp_obj_t common_hal_os_listdir(const char* path) {
         iter.base.type = &mp_type_polymorph_iter;
         iter.iternext = mp_vfs_ilistdir_it_iternext;
         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;
     } else {
         iter_obj = mp_vfs_proxy_call(vfs, MP_QSTR_ilistdir, 1, &path_out);

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ mp_obj_t os_listdir(size_t n_args, const mp_obj_t *args) {`
`87`	`87`	`if (n_args == 1) {`
`88`	`88`	`path = mp_obj_str_get_str(args[0]);`
`89`	`89`	`} else {`
`90`		`- path = "";`
	`90`	`+ path = mp_obj_str_get_str(common_hal_os_getcwd());`
`91`	`91`	`}`
`92`	`92`	`return common_hal_os_listdir(path);`
`93`	`93`	`}`