Skip to content

GH-113528: Deoptimise pathlib._abc.PathBase._make_child_relpath() #113532

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 4 commits into from
Jan 9, 2024
Merged

GH-113528: Deoptimise pathlib._abc.PathBase._make_child_relpath() #113532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec72e03
GH-113528: Deoptimise `pathlib._abc.PathBase._make_child_relpath()`
barneygale Dec 28, 2023
2ae1411
Merge branch 'main' into gh-113528-deoptimise-make-child-relpath
barneygale Dec 28, 2023
f933e7f
Merge branch 'main' into gh-113528-deoptimise-make-child-relpath
barneygale Jan 4, 2024
693a770
Merge branch 'main' into gh-113528-deoptimise-make-child-relpath
barneygale Jan 6, 2024
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
16 changes: 16 additions & 0 deletions Lib/pathlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,22 @@ def _make_child_entry(self, entry):
path._tail_cached = self._tail + [entry.name]
return path

def _make_child_relpath(self, name):
path_str = str(self)
tail = self._tail
if tail:
path_str = f'{path_str}{self.pathmod.sep}{name}'
elif path_str != '.':
path_str = f'{path_str}{name}'
else:
path_str = name
path = self.with_segments(path_str)
path._str = path_str
path._drv = self.drive
path._root = self.root
path._tail_cached = tail + [name]
return path

def glob(self, pattern, *, case_sensitive=None, follow_symlinks=None):
"""Iterate over this subtree and yield all existing files (of any
kind, including directories) matching the given relative pattern.
Expand Down
15 changes: 1 addition & 14 deletions Lib/pathlib/_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,20 +753,7 @@ def _make_child_entry(self, entry):
return entry

def _make_child_relpath(self, name):
path_str = str(self)
tail = self._tail
if tail:
path_str = f'{path_str}{self.pathmod.sep}{name}'
elif path_str != '.':
path_str = f'{path_str}{name}'
else:
path_str = name
path = self.with_segments(path_str)
path._str = path_str
path._drv = self.drive
path._root = self.root
path._tail_cached = tail + [name]
return path
return self.joinpath(name)

def glob(self, pattern, *, case_sensitive=None, follow_symlinks=None):
"""Iterate over this subtree and yield all existing files (of any
Expand Down