Skip to content

dirfs: Ensures consistency of details returned by the “ls” and “info” methods. #1798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2025
Merged

dirfs: Ensures consistency of details returned by the “ls” and “info” methods. #1798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions fsspec/implementations/dirfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,16 @@ def exists(self, path):
return self.fs.exists(self._join(path))

async def _info(self, path, **kwargs):
return await self.fs._info(self._join(path), **kwargs)
info = await self.fs._info(self._join(path), **kwargs)
info = info.copy()
info["name"] = self._relpath(info["name"])
return info

def info(self, path, **kwargs):
return self.fs.info(self._join(path), **kwargs)
info = self.fs.info(self._join(path), **kwargs)
info = info.copy()
info["name"] = self._relpath(info["name"])
return info

async def _ls(self, path, detail=True, **kwargs):
ret = (await self.fs._ls(self._join(path), detail=detail, **kwargs)).copy()
Expand Down
6 changes: 4 additions & 2 deletions fsspec/implementations/tests/test_dirfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,14 @@ def test_exists(dirfs):

@pytest.mark.asyncio
async def test_async_info(adirfs):
assert await adirfs._info("file", **KWARGS) == adirfs.fs._info.return_value
adirfs.fs._info.return_value = {"name": f"{PATH}/file", "foo": "bar"}
assert await adirfs._info("file", **KWARGS) == {"name": "file", "foo": "bar"}
adirfs.fs._info.assert_called_once_with(f"{PATH}/file", **KWARGS)


def test_info(dirfs):
assert dirfs.info("file", **KWARGS) == dirfs.fs.info.return_value
dirfs.fs.info.return_value = {"name": f"{PATH}/file", "foo": "bar"}
assert dirfs.info("file", **KWARGS) == {"name": "file", "foo": "bar"}
dirfs.fs.info.assert_called_once_with(f"{PATH}/file", **KWARGS)


Expand Down
Loading