Skip to content

handle paths ending with sep in dvc.fs.path.Path.parts #7234

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
efiop merged 2 commits into from
Jan 7, 2022
Merged

handle paths ending with sep in dvc.fs.path.Path.parts #7234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7db4bc
handle paths ending with sep in dvc.fs.path.Path.parts
jonburdo Jan 6, 2022
3d99bce
add tests for Path.parts
jonburdo Jan 6, 2022
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
2 changes: 1 addition & 1 deletion dvc/fs/path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def join(self, *parts):
return self.flavour.join(*parts)

def parts(self, path):
drive, path = self.flavour.splitdrive(path)
drive, path = self.flavour.splitdrive(path.rstrip(self.flavour.sep))
Copy link
Contributor

@efiop efiop Jan 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add a simple unit test for this? (e.g. create tests/unit/fs/test_path.py for it) This module is kinda experimental, but since we are fixing such things already, it would be great to keep track of them.


ret = []
while True:
Expand Down
29 changes: 29 additions & 0 deletions tests/unit/fs/test_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import pytest

from dvc.fs.path import Path


@pytest.mark.parametrize("prefix", ["", "/"])
@pytest.mark.parametrize("postfix", ["", "/"])
@pytest.mark.parametrize(
"path,expected",
[
("path", ("path",)),
("some/path", ("some", "path")),
],
)
def test_parts_posix(prefix, postfix, path, expected):
assert Path("/").parts(prefix + path + postfix) == tuple(prefix) + expected


@pytest.mark.parametrize("postfix", ["", "\\"])
@pytest.mark.parametrize(
"path,expected",
[
("path", ("path",)),
("c:\\path", ("c:", "\\", "path")),
("some\\path", ("some", "path")),
],
)
def test_parts_nt(postfix, path, expected):
assert Path("\\").parts(path + postfix) == expected