diff options
| author | Damien George <damien@micropython.org> | 2025-03-11 14:39:41 +1100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2025-03-27 17:04:12 +1100 |
| commit | e4051a1ca66703090383678a1747c3f99e993309 (patch) | |
| tree | 05b0ece8c55b373a4fb561c676beb389012e10c3 | |
| parent | c68a40ac94ea8a8dd6031dff6f21706977893bef (diff) | |
extmod/vfs_rom: Implement minimal VfsRom.getcwd() method.
This is needed if you chdir to a ROMFS and want to query your current
directory.
Prior to this change, using `os.getcwd()` when in a ROMFS would raise:
AttributeError: 'VfsRom' object has no attribute 'getcwd'
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | extmod/vfs_rom.c | 8 | ||||
| -rw-r--r-- | tests/extmod/vfs_rom.py | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/extmod/vfs_rom.c b/extmod/vfs_rom.c index ff3652d2c..7d814cb98 100644 --- a/extmod/vfs_rom.c +++ b/extmod/vfs_rom.c @@ -300,6 +300,13 @@ static mp_obj_t vfs_rom_chdir(mp_obj_t self_in, mp_obj_t path_in) { } static MP_DEFINE_CONST_FUN_OBJ_2(vfs_rom_chdir_obj, vfs_rom_chdir); +static mp_obj_t vfs_rom_getcwd(mp_obj_t self_in) { + (void)self_in; + // The current directory is always the root of the ROMFS. + return MP_OBJ_NEW_QSTR(MP_QSTR_); +} +static MP_DEFINE_CONST_FUN_OBJ_1(vfs_rom_getcwd_obj, vfs_rom_getcwd); + typedef struct _vfs_rom_ilistdir_it_t { mp_obj_base_t base; mp_fun_1_t iternext; @@ -436,6 +443,7 @@ static const mp_rom_map_elem_t vfs_rom_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&vfs_rom_open_obj) }, { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&vfs_rom_chdir_obj) }, + { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&vfs_rom_getcwd_obj) }, { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&vfs_rom_ilistdir_obj) }, { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&vfs_rom_stat_obj) }, { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&vfs_rom_statvfs_obj) }, diff --git a/tests/extmod/vfs_rom.py b/tests/extmod/vfs_rom.py index dc88481c0..770b6863b 100644 --- a/tests/extmod/vfs_rom.py +++ b/tests/extmod/vfs_rom.py @@ -408,9 +408,11 @@ class TestMounted(TestBase): def test_chdir(self): os.chdir("/test_rom") + self.assertEqual(os.getcwd(), "/test_rom") self.assertEqual(os.listdir(), self.romfs_listdir) os.chdir("/test_rom/") + self.assertEqual(os.getcwd(), "/test_rom") self.assertEqual(os.listdir(), self.romfs_listdir) # chdir within the romfs is not implemented. |