]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
GH-106330: Fix matching of empty path in `pathlib.PurePath.match()` (GH-106331)
authorBarney Gale <barney.gale@gmail.com>
Mon, 3 Jul 2023 20:29:44 +0000 (21:29 +0100)
committerGitHub <noreply@github.com>
Mon, 3 Jul 2023 20:29:44 +0000 (21:29 +0100)
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.

Lib/pathlib.py
Lib/test/test_pathlib.py
Misc/NEWS.d/next/Library/2023-07-02-10-56-41.gh-issue-106330.QSkIUH.rst [new file with mode: 0644]

index e15718dc98d677c9c6daebb54dff44a9ffad0544..f3813e04109904a0d69faf515a557833cf418843 100644 (file)
@@ -463,8 +463,12 @@ class PurePath:
         try:
             return self._lines_cached
         except AttributeError:
-            trans = _SWAP_SEP_AND_NEWLINE[self._flavour.sep]
-            self._lines_cached = str(self).translate(trans)
+            path_str = str(self)
+            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
 
     def __eq__(self, other):
index 464a835212d472a2c2cb63da8f5b00e20ad20f54..eb2b0cfb26e85ffc51e8d05079dddd85997cffba 100644 (file)
@@ -384,6 +384,10 @@ class PurePathTest(unittest.TestCase):
         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.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):
         # Ordering is tuple-alike.
diff --git a/Misc/NEWS.d/next/Library/2023-07-02-10-56-41.gh-issue-106330.QSkIUH.rst b/Misc/NEWS.d/next/Library/2023-07-02-10-56-41.gh-issue-106330.QSkIUH.rst
new file mode 100644 (file)
index 0000000..c1f55ab
--- /dev/null
@@ -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.