Visitar URL original
GH-101362: Optimise pathlib by deferring path normalisation by barneygale · Pull Request #101560 · python/cpython · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Undo change to joinpath(), fix news blurb.
  • Loading branch information
barneygale committed Mar 17, 2023
commit 97995bd2c3ea3c31bb420fab61d55b4ff0332bd0
17 changes: 16 additions & 1 deletion Lib/pathlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,22 @@ def joinpath(self, *args):
paths) or a totally different path (if one of the arguments is
anchored).
"""
return self._from_parts((self,) + args)
drv1, root1, parts1 = self._drv, self._root, self._parts
drv2, root2, parts2 = self._parse_parts(args)
if root2:
if not drv2 and drv1:
return self._from_parsed_parts(drv1, root2, [drv1 + root2] + parts2[1:])
else:
return self._from_parsed_parts(drv2, root2, parts2)
elif drv2:
if drv2 == drv1 or self._flavour.normcase(drv2) == self._flavour.normcase(drv1):
# Same drive => second path is relative to the first.
return self._from_parsed_parts(drv1, root1, parts1 + parts2[1:])
else:
return self._from_parsed_parts(drv2, root2, parts2)
else:
# Second path is non-anchored (common case).
return self._from_parsed_parts(drv1, root1, parts1 + parts2)

def __truediv__(self, key):
try:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Speed up construction and joining of :class:`pathlib.PurePath` objects by
deferring path parsing and normalization until needed. Some path object
operations are 2-4x faster as a result of this change.
Speed up construction of :class:`pathlib.PurePath` objects by deferring
path parsing and normalization.