Skip to content

GH-101362: Optimise pathlib by deferring path normalisation #101560

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 16 commits into from
Closed

GH-101362: Optimise pathlib by deferring path normalisation #101560

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b428069
GH-101362 - Optimise pathlib by deferring path normalisation
barneygale Jan 27, 2023
e49e719
Restore str force-casting behaviour; reduce diff a little.
barneygale Feb 4, 2023
a931986
Fix pathlib usage error in importlib
barneygale Feb 4, 2023
38f70bf
Improve initialiser performance.
barneygale Feb 4, 2023
10844a6
Add NEWS blurb
barneygale Feb 4, 2023
d5231b6
Store '_fspath' as non-empty string.
barneygale Feb 4, 2023
76b2db7
Merge branch 'main' into optimize-pathlib-part-2b
barneygale Mar 6, 2023
cc2c711
Undo addition of `__init__()` and change to `_from_parsed_parts()`
barneygale Mar 6, 2023
cbf0fcd
Fix pickling of paths created via walking.
barneygale Mar 6, 2023
eb7087f
Simplify patch slightly
barneygale Mar 6, 2023
3b53e27
Remove unused import
barneygale Mar 11, 2023
dec98f2
Merge branch 'main' into optimize-pathlib-part-2b
barneygale Mar 11, 2023
d9a6080
Fix dodgy merge, add comment about _from_parsed_parts()
barneygale Mar 11, 2023
9650dca
Stop returning unnormalised path from `__fspath__()`
barneygale Mar 17, 2023
af27476
Merge branch 'main' into optimize-pathlib-part-2b
barneygale Mar 17, 2023
97995bd
Undo change to `joinpath()`, fix news blurb.
barneygale Mar 17, 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
Next Next commit
Improve initialiser performance.
  • Loading branch information
@barneygale
barneygale committed Feb 4, 2023
commit 38f70bf2f785ac37bc970b7789b0f29047144af5
31 changes: 13 additions & 18 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,26 +286,21 @@ def _parse_path(cls, path):
return drv, root, parsed

def __init__(self, *args):
parts = []
for a in args:
if isinstance(a, PurePath):
parts += a._parts
if args:
if len(args) == 1:
path = os.fspath(args[0])
else:
a = os.fspath(a)
if isinstance(a, str):
# Force-cast str subclasses to str (issue #21127)
parts.append(str(a))
else:
raise TypeError(
"argument should be a str object or an os.PathLike "
"object returning str, not %r"
% type(a))
if not parts:
self._fspath = ''
elif len(parts) == 1:
self._fspath = os.fspath(parts[0])
path = self._flavour.join(*args)
if isinstance(path, str):
# Force-cast str subclasses to str (issue #21127)
self._fspath = str(path)
else:
raise TypeError(
"argument should be a str object or an os.PathLike "
"object returning str, not %r"
% type(path))
else:
self._fspath = self._flavour.join(*parts)
self._fspath = ''

def _load_parts(self):
drv, root, parts = self._parse_path(self._fspath)
Expand Down