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

GH-106330: Fix matching of empty path in pathlib.PurePath.match() (GH-106331)

Browse source 
We match paths using the `_lines` attribute, which is derived from the
path's string representation. The bug arises because an empty path's string
representation is `'.'` (not `''`), which is matched by the `'*'` wildcard.
This commit is contained in:
Barney Gale 2023-07-03 21:29:44 +01:00 • committed by GitHub
parent e5862113dd
commit b4efdf8cda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/pathlib.py
View file

@ -463,8 +463,12 @@ class PurePath:
try: try:
return self._lines_cached return self._lines_cached
except AttributeError: except AttributeError:
trans = _SWAP_SEP_AND_NEWLINE[self._flavour.sep] path_str = str(self)
self._lines_cached = str(self).translate(trans) if path_str == '.':
self._lines_cached = ''
else:
trans = _SWAP_SEP_AND_NEWLINE[self._flavour.sep]
self._lines_cached = path_str.translate(trans)
return self._lines_cached return self._lines_cached
def __eq__(self, other): def __eq__(self, other):

4
Lib/test/test_pathlib.py
View file

@ -384,6 +384,10 @@ class PurePathTest(unittest.TestCase):
self.assertTrue(P('A.py').match('a.PY', case_sensitive=False)) self.assertTrue(P('A.py').match('a.PY', case_sensitive=False))
self.assertFalse(P('c:/a/B.Py').match('C:/A/*.pY', case_sensitive=True)) self.assertFalse(P('c:/a/B.Py').match('C:/A/*.pY', case_sensitive=True))
self.assertTrue(P('/a/b/c.py').match('/A/*/*.Py', case_sensitive=False)) self.assertTrue(P('/a/b/c.py').match('/A/*/*.Py', case_sensitive=False))
# Matching against empty path
self.assertFalse(P().match('*'))
self.assertTrue(P().match('**'))
self.assertFalse(P().match('**/*'))
def test_ordering_common(self): def test_ordering_common(self):
# Ordering is tuple-alike. # Ordering is tuple-alike.

2
Misc/NEWS.d/next/Library/2023-07-02-10-56-41.gh-issue-106330.QSkIUH.rst Normal file
View file

@ -0,0 +1,2 @@
Fix incorrect matching of empty paths in :meth:`pathlib.PurePath.match`.
This bug was introduced in Python 3.12.0 beta 1.