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

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
Fix zipfile.Path.
  • Loading branch information
@barneygale
barneygale committed Apr 18, 2023
commit 3dc0e963475dde4aa1f4818f0f57beef1ec6d3d7
13 changes: 8 additions & 5 deletions Lib/zipfile/_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,23 +298,26 @@ def open(self, mode='r', *args, pwd=None, **kwargs):

@property
def name(self):
return pathlib.Path(self.at).name or self.filename.name
return pathlib.Path(self.at.rstrip("/")).name or self.filename.name

@property
def suffix(self):
return pathlib.Path(self.at).suffix or self.filename.suffix
return pathlib.Path(self.at.rstrip("/")).suffix or self.filename.suffix

@property
def suffixes(self):
return pathlib.Path(self.at).suffixes or self.filename.suffixes
return pathlib.Path(self.at.rstrip("/")).suffixes or self.filename.suffixes

@property
def stem(self):
return pathlib.Path(self.at).stem or self.filename.stem
return pathlib.Path(self.at.rstrip("/")).stem or self.filename.stem

@property
def filename(self):
return pathlib.Path(self.root.filename).joinpath(self.at)
path = pathlib.Path(self.root.filename)
if self.at:
path = path.joinpath(self.at.rstrip("/"))
return path

def read_text(self, *args, **kwargs):
encoding, args, kwargs = _extract_text_encoding(*args, **kwargs)
Expand Down