Skip to content
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

bpo-40038: pathlib: remove partial support for preserving accessor when modifying a path #19342

Merged
merged 1 commit into from
Apr 7, 2021
Merged

bpo-40038: pathlib: remove partial support for preserving accessor when modifying a path #19342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 8 additions & 33 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,26 +692,22 @@ def _parse_args(cls, args):
return cls._flavour.parse_parts(parts)

@classmethod
def _from_parts(cls, args, init=True):
def _from_parts(cls, args):
# We need to call _parse_args on the instance, so as to get the
# right flavour.
self = object.__new__(cls)
drv, root, parts = self._parse_args(args)
self._drv = drv
self._root = root
self._parts = parts
if init:
self._init()
return self

@classmethod
def _from_parsed_parts(cls, drv, root, parts, init=True):
def _from_parsed_parts(cls, drv, root, parts):
self = object.__new__(cls)
self._drv = drv
self._root = root
self._parts = parts
if init:
self._init()
return self

@classmethod
Expand All @@ -721,10 +717,6 @@ def _format_parsed_parts(cls, drv, root, parts):
else:
return cls._flavour.join(parts)

def _init(self):
# Overridden in concrete Path
pass

def _make_child(self, args):
drv, root, parts = self._parse_args(args)
drv, root, parts = self._flavour.join_parsed_parts(
Expand Down Expand Up @@ -1064,29 +1056,18 @@ class Path(PurePath):
object. You can also instantiate a PosixPath or WindowsPath directly,
but cannot instantiate a WindowsPath on a POSIX system or vice versa.
"""
__slots__ = (
'_accessor',
)
_accessor = _normal_accessor
__slots__ = ()

def __new__(cls, *args, **kwargs):
if cls is Path:
cls = WindowsPath if os.name == 'nt' else PosixPath
self = cls._from_parts(args, init=False)
self = cls._from_parts(args)
if not self._flavour.is_supported:
raise NotImplementedError("cannot instantiate %r on your system"
% (cls.__name__,))
self._init()
return self

def _init(self,
# Private non-constructor arguments
template=None,
):
if template is not None:
self._accessor = template._accessor
else:
self._accessor = _normal_accessor

def _make_child_relpath(self, part):
# This is an optimization used for dir walking. `part` must be
# a single part relative to this path.
Expand Down Expand Up @@ -1194,9 +1175,7 @@ def absolute(self):
return self
# FIXME this must defer to the specific flavour (and, under Windows,
# use nt._getfullpathname())
obj = self._from_parts([os.getcwd()] + self._parts, init=False)
obj._init(template=self)
return obj
return self._from_parts([os.getcwd()] + self._parts)

def resolve(self, strict=False):
"""
Expand All @@ -1212,9 +1191,7 @@ def resolve(self, strict=False):
s = str(self.absolute())
# Now we have no symlinks in the path, it's safe to normalize it.
normed = self._flavour.pathmod.normpath(s)
obj = self._from_parts((normed,), init=False)
obj._init(template=self)
return obj
return self._from_parts((normed,))

def stat(self):
"""
Expand Down Expand Up @@ -1282,9 +1259,7 @@ def readlink(self):
Return the path to which the symbolic link points.
"""
path = self._accessor.readlink(self)
obj = self._from_parts((path,), init=False)
obj._init(template=self)
return obj
return self._from_parts((path,))

def touch(self, mode=0o666, exist_ok=True):
"""
Expand Down