Thanks to visit codestin.com
Credit goes to github.com

Skip to content

GH-101362: Omit path anchor from pathlib.PurePath()._parts #102476

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
barneygale merged 13 commits into from
Apr 9, 2023
Merged

GH-101362: Omit path anchor from pathlib.PurePath()._parts #102476

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8bf4600
GH-101362: Omit path anchor from `pathlib.PurePath()._parts`
barneygale Mar 6, 2023
e7a58c3
Add news blurb.
barneygale Mar 6, 2023
1d58aed
Rename `_parts` to `_tail` for clarity.
barneygale Mar 6, 2023
ac26f84
Merge branch 'main' into gh-101362-exclude-anchor-from-parts
barneygale Mar 10, 2023
cce5d7b
Undo some changes to _format_parsed_parts()
barneygale Mar 10, 2023
f529d51
Merge branch 'main' into gh-101362-exclude-anchor-from-parts
barneygale Apr 3, 2023
0c0f5bd
Move `str()` call out of initialiser.
barneygale Apr 3, 2023
7a4e92f
Optimize `_make_child_relpath()`
barneygale Apr 3, 2023
c8d4b38
Remove caching of `Path.parts`
barneygale Apr 3, 2023
d2a578d
Cache case-normalized string.
barneygale Apr 6, 2023
de4df7a
Rename `_make_child` back to `_make_child_relpath`
barneygale Apr 7, 2023
5a34f7e
Add comments to `PurePath.__slots__`
barneygale Apr 8, 2023
078ced9
Merge branch 'main' into gh-101362-exclude-anchor-from-parts
barneygale Apr 9, 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
Cache case-normalized string.
  • Loading branch information
@barneygale
barneygale committed Apr 7, 2023
commit d2a578db100e7aa50212e9ca6f31433a4c36aad2
22 changes: 16 additions & 6 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ class PurePath(object):
__slots__ = (
'_raw_path', '_drv', '_root', '_tail_cached',
'_str', '_hash', '_parts_normcase_cached',
'_str_normcase_cached',
)
_flavour = os.path

Expand Down Expand Up @@ -367,25 +368,34 @@ def as_uri(self):
path = str(self)
return prefix + urlquote_from_bytes(os.fsencode(path))

@property
def _str_normcase(self):
# String with normalized case, for hashing and equality checks
try:
return self._str_normcase_cached
except AttributeError:
self._str_normcase_cached = self._flavour.normcase(str(self))
return self._str_normcase_cached

@property
def _parts_normcase(self):
# Cached parts with normalized case, for hashing and comparison.
# Cached parts with normalized case, for comparisons.
try:
return self._parts_normcase_cached
except AttributeError:
self._parts_normcase_cached = [self._flavour.normcase(p) for p in self.parts]
self._parts_normcase_cached = self._str_normcase.split(self._flavour.sep)
return self._parts_normcase_cached

def __eq__(self, other):
if not isinstance(other, PurePath):
return NotImplemented
return self._parts_normcase == other._parts_normcase and self._flavour is other._flavour
return self._str_normcase == other._str_normcase and self._flavour is other._flavour

def __hash__(self):
try:
return self._hash
except AttributeError:
self._hash = hash(tuple(self._parts_normcase))
self._hash = hash(self._str_normcase)
return self._hash

def __lt__(self, other):
Expand Down Expand Up @@ -632,9 +642,9 @@ def match(self, path_pattern):
Return True if this path matches the given pattern.
"""
pat = type(self)(path_pattern)
pat_parts = pat._parts_normcase
if not pat_parts:
if not pat.parts:
raise ValueError("empty pattern")
pat_parts = pat._parts_normcase
parts = self._parts_normcase
if pat.drive or pat.root:
if len(pat_parts) != len(parts):
Expand Down