https://github.com/python/cpython/commit/1b1f8398d0ffe3c8ba2cca79d0c0f19a6a34e72a
commit: 1b1f8398d0ffe3c8ba2cca79d0c0f19a6a34e72a
branch: main
author: Barney Gale <[email protected]>
committer: barneygale <[email protected]>
date: 2024-02-06T02:48:18Z
summary:
GH-106747: Make pathlib ABC globbing more consistent with `glob.glob()`
(#115056)
When expanding `**` wildcards, ensure we add a trailing slash to the
topmost directory path. This matches `glob.glob()` behaviour:
>>> glob.glob('dirA/**', recursive=True)
['dirA/', 'dirA/dirB', 'dirA/dirB/dirC']
This does not affect `pathlib.Path.glob()`, because trailing slashes aren't
supported in pathlib proper.
files:
M Lib/pathlib/_abc.py
M Lib/test/test_pathlib/test_pathlib_abc.py
diff --git a/Lib/pathlib/_abc.py b/Lib/pathlib/_abc.py
index 91f5cd6c01e9d0..e4b1201a3703c3 100644
--- a/Lib/pathlib/_abc.py
+++ b/Lib/pathlib/_abc.py
@@ -95,7 +95,7 @@ def _select_recursive(parent_paths, dir_only,
follow_symlinks):
if follow_symlinks is None:
follow_symlinks = False
for parent_path in parent_paths:
- paths = [parent_path]
+ paths = [parent_path._make_child_relpath('')]
while paths:
path = paths.pop()
yield path
diff --git a/Lib/test/test_pathlib/test_pathlib_abc.py
b/Lib/test/test_pathlib/test_pathlib_abc.py
index 207579ccbf443b..1d30deca8f7a1b 100644
--- a/Lib/test/test_pathlib/test_pathlib_abc.py
+++ b/Lib/test/test_pathlib/test_pathlib_abc.py
@@ -1791,25 +1791,25 @@ def _check(path, glob, expected):
_check(p, "*/", ["dirA/", "dirB/", "dirC/", "dirE/", "linkB/"])
_check(p, "dir*/*/..", ["dirC/dirD/..", "dirA/linkC/..",
"dirB/linkD/.."])
_check(p, "dir*/**", [
- "dirA", "dirA/linkC", "dirA/linkC/fileB", "dirA/linkC/linkD",
"dirA/linkC/linkD/fileB",
- "dirB", "dirB/fileB", "dirB/linkD", "dirB/linkD/fileB",
- "dirC", "dirC/fileC", "dirC/dirD", "dirC/dirD/fileD",
"dirC/novel.txt",
- "dirE"])
+ "dirA/", "dirA/linkC", "dirA/linkC/fileB", "dirA/linkC/linkD",
"dirA/linkC/linkD/fileB",
+ "dirB/", "dirB/fileB", "dirB/linkD", "dirB/linkD/fileB",
+ "dirC/", "dirC/fileC", "dirC/dirD", "dirC/dirD/fileD",
"dirC/novel.txt",
+ "dirE/"])
_check(p, "dir*/**/", ["dirA/", "dirA/linkC/", "dirA/linkC/linkD/",
"dirB/", "dirB/linkD/",
"dirC/", "dirC/dirD/", "dirE/"])
_check(p, "dir*/**/..", ["dirA/..", "dirA/linkC/..", "dirB/..",
"dirB/linkD/..", "dirA/linkC/linkD/..",
"dirC/..", "dirC/dirD/..", "dirE/.."])
_check(p, "dir*/*/**", [
- "dirA/linkC", "dirA/linkC/linkD", "dirA/linkC/fileB",
"dirA/linkC/linkD/fileB",
- "dirB/linkD", "dirB/linkD/fileB",
- "dirC/dirD", "dirC/dirD/fileD"])
+ "dirA/linkC/", "dirA/linkC/linkD", "dirA/linkC/fileB",
"dirA/linkC/linkD/fileB",
+ "dirB/linkD/", "dirB/linkD/fileB",
+ "dirC/dirD/", "dirC/dirD/fileD"])
_check(p, "dir*/*/**/", ["dirA/linkC/", "dirA/linkC/linkD/",
"dirB/linkD/", "dirC/dirD/"])
_check(p, "dir*/*/**/..", ["dirA/linkC/..", "dirA/linkC/linkD/..",
"dirB/linkD/..", "dirC/dirD/.."])
_check(p, "dir*/**/fileC", ["dirC/fileC"])
_check(p, "dir*/*/../dirD/**/", ["dirC/dirD/../dirD/"])
- _check(p, "*/dirD/**", ["dirC/dirD", "dirC/dirD/fileD"])
+ _check(p, "*/dirD/**", ["dirC/dirD/", "dirC/dirD/fileD"])
_check(p, "*/dirD/**/", ["dirC/dirD/"])
@needs_symlinks
@@ -1827,19 +1827,19 @@ def _check(path, glob, expected):
_check(p, "*/", ["dirA/", "dirB/", "dirC/", "dirE/"])
_check(p, "dir*/*/..", ["dirC/dirD/.."])
_check(p, "dir*/**", [
- "dirA", "dirA/linkC",
- "dirB", "dirB/fileB", "dirB/linkD",
- "dirC", "dirC/fileC", "dirC/dirD", "dirC/dirD/fileD",
"dirC/novel.txt",
- "dirE"])
+ "dirA/", "dirA/linkC",
+ "dirB/", "dirB/fileB", "dirB/linkD",
+ "dirC/", "dirC/fileC", "dirC/dirD", "dirC/dirD/fileD",
"dirC/novel.txt",
+ "dirE/"])
_check(p, "dir*/**/", ["dirA/", "dirB/", "dirC/", "dirC/dirD/",
"dirE/"])
_check(p, "dir*/**/..", ["dirA/..", "dirB/..", "dirC/..",
"dirC/dirD/..", "dirE/.."])
- _check(p, "dir*/*/**", ["dirC/dirD", "dirC/dirD/fileD"])
+ _check(p, "dir*/*/**", ["dirC/dirD/", "dirC/dirD/fileD"])
_check(p, "dir*/*/**/", ["dirC/dirD/"])
_check(p, "dir*/*/**/..", ["dirC/dirD/.."])
_check(p, "dir*/**/fileC", ["dirC/fileC"])
- _check(p, "dir*/*/../dirD/**", ["dirC/dirD/../dirD",
"dirC/dirD/../dirD/fileD"])
+ _check(p, "dir*/*/../dirD/**", ["dirC/dirD/../dirD/",
"dirC/dirD/../dirD/fileD"])
_check(p, "dir*/*/../dirD/**/", ["dirC/dirD/../dirD/"])
- _check(p, "*/dirD/**", ["dirC/dirD", "dirC/dirD/fileD"])
+ _check(p, "*/dirD/**", ["dirC/dirD/", "dirC/dirD/fileD"])
_check(p, "*/dirD/**/", ["dirC/dirD/"])
def test_rglob_common(self):
@@ -1876,13 +1876,13 @@ def _check(glob, expected):
"dirC/dirD", "dirC/dirD/fileD"])
_check(p.rglob("file*"), ["dirC/fileC", "dirC/dirD/fileD"])
_check(p.rglob("**/file*"), ["dirC/fileC", "dirC/dirD/fileD"])
- _check(p.rglob("dir*/**"), ["dirC/dirD", "dirC/dirD/fileD"])
+ _check(p.rglob("dir*/**"), ["dirC/dirD/", "dirC/dirD/fileD"])
_check(p.rglob("dir*/**/"), ["dirC/dirD/"])
_check(p.rglob("*/*"), ["dirC/dirD/fileD"])
_check(p.rglob("*/"), ["dirC/dirD/"])
_check(p.rglob(""), ["dirC/", "dirC/dirD/"])
_check(p.rglob("**"), [
- "dirC", "dirC/fileC", "dirC/dirD", "dirC/dirD/fileD",
"dirC/novel.txt"])
+ "dirC/", "dirC/fileC", "dirC/dirD", "dirC/dirD/fileD",
"dirC/novel.txt"])
_check(p.rglob("**/"), ["dirC/", "dirC/dirD/"])
# gh-91616, a re module regression
_check(p.rglob("*.txt"), ["dirC/novel.txt"])
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
