mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

GH-127807: pathlib ABCs: remove PurePathBase._raw_paths (#127883)

Browse source 
Remove the `PurePathBase` initializer, and make `with_segments()` and
`__str__()` abstract. This allows us to drop the `_raw_paths` attribute,
and also the `Parser.join()` protocol method.
This commit is contained in:
Barney Gale 2024-12-22 01:17:59 +00:00 • committed by GitHub
parent 2a66dd33df
commit a959ea1b0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 92 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Lib/pathlib/_local.py
View file

@ -77,6 +77,10 @@ class PurePath(PurePathBase):
"""
__slots__ = (
# The `_raw_paths` slot stores unjoined string paths. This is set in
# the `__init__()` method.
'_raw_paths',
# The `_drv`, `_root` and `_tail_cached` slots store parsed and
# normalized parts of the path. They are set when any of the `drive`,
# `root` or `_tail` properties are accessed for the first time. The
@ -140,9 +144,15 @@ class PurePath(PurePathBase):
"object where __fspath__ returns a str, "
f"not {type(path).__name__!r}")
paths.append(path)
# Avoid calling super().__init__, as an optimisation
self._raw_paths = paths
def with_segments(self, *pathsegments):
"""Construct a new path object from any number of path-like objects.
Subclasses may override this method to customize how new path objects
are created from methods like `iterdir()`.
"""
return type(self)(*pathsegments)
def joinpath(self, *pathsegments):
"""Combine this path with one or several arguments, and return a
new path representing either a subpath (if all arguments are relative
@ -304,14 +314,29 @@ class PurePath(PurePathBase):
parts.append('')
return parts
@property
def _raw_path(self):
paths = self._raw_paths
if len(paths) == 1:
return paths[0]
elif paths:
# Join path segments from the initializer.
path = self.parser.join(*paths)
# Cache the joined path.
paths.clear()
paths.append(path)
return path
else:
paths.append('')
return ''
@property
def drive(self):
"""The drive prefix (letter or UNC path), if any."""
try:
return self._drv
except AttributeError:
raw_path = PurePathBase.__str__(self)
self._drv, self._root, self._tail_cached = self._parse_path(raw_path)
self._drv, self._root, self._tail_cached = self._parse_path(self._raw_path)
return self._drv
@property
@ -320,8 +345,7 @@ class PurePath(PurePathBase):
try:
return self._root
except AttributeError:
raw_path = PurePathBase.__str__(self)
self._drv, self._root, self._tail_cached = self._parse_path(raw_path)
self._drv, self._root, self._tail_cached = self._parse_path(self._raw_path)
return self._root
@property
@ -329,8 +353,7 @@ class PurePath(PurePathBase):
try:
return self._tail_cached
except AttributeError:
raw_path = PurePathBase.__str__(self)
self._drv, self._root, self._tail_cached = self._parse_path(raw_path)
self._drv, self._root, self._tail_cached = self._parse_path(self._raw_path)
return self._tail_cached
@property