Skip to content

GH-65238: Fix stripping of trailing slash in pathlib #103595

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

Closed
barneygale wants to merge 3 commits into from
Closed

GH-65238: Fix stripping of trailing slash in pathlib #103595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2e0a49
GH-65238: Fix stripping of trailing slash in pathlib
barneygale Apr 9, 2023
b15b71e
Fix `iterdir()` on path with trailing slash.
barneygale Apr 17, 2023
3dc0e96
Fix `zipfile.Path`.
barneygale Apr 18, 2023
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
Prev Previous commit
Next Next commit
Fix iterdir() on path with trailing slash.
  • Loading branch information
@barneygale
barneygale committed Apr 17, 2023
commit b15b71eb593cfef54df6ee6170bf625b2ee9f251
3 changes: 2 additions & 1 deletion Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,10 +750,11 @@ def __new__(cls, *args, **kwargs):
def _make_child_relpath(self, name):
path_str = str(self)
tail = self._tail
if tail:
if tail and tail[-1]:
path_str = f'{path_str}{self._flavour.sep}{name}'
elif path_str != '.':
path_str = f'{path_str}{name}'
tail = tail[:-1]
else:
path_str = name
path = type(self)(path_str)
Expand Down
14 changes: 7 additions & 7 deletions Lib/test/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,13 +1774,13 @@ def test_write_text_with_newlines(self):

def test_iterdir(self):
P = self.cls
p = P(BASE)
it = p.iterdir()
paths = set(it)
expected = ['dirA', 'dirB', 'dirC', 'dirE', 'fileA']
if os_helper.can_symlink():
expected += ['linkA', 'linkB', 'brokenLink', 'brokenLinkLoop']
self.assertEqual(paths, { P(BASE, q) for q in expected })
for p in [P(BASE), P(BASE, '')]:
it = p.iterdir()
paths = set(it)
expected = ['dirA', 'dirB', 'dirC', 'dirE', 'fileA']
if os_helper.can_symlink():
expected += ['linkA', 'linkB', 'brokenLink', 'brokenLinkLoop']
self.assertEqual(paths, { P(BASE, q) for q in expected })

@os_helper.skip_unless_symlink
def test_iterdir_symlink(self):
Expand Down