https://github.com/python/cpython/commit/6f07016bf01366da5939c4029c91b7f37ddddd55
commit: 6f07016bf01366da5939c4029c91b7f37ddddd55
branch: main
author: Barney Gale <barney.g...@gmail.com>
committer: barneygale <barney.g...@gmail.com>
date: 2025-02-17T19:15:59Z
summary:
GH-127381: pathlib ABCs: remove `ReadablePath.rglob()` (#130207)
Remove `ReadablePath.rglob()` from the private pathlib ABCs. This method is
a trivial wrapper around `glob()` and easily replaced.
files:
M Lib/pathlib/_abc.py
M Lib/test/test_pathlib/test_pathlib.py
M Lib/test/test_pathlib/test_pathlib_abc.py
diff --git a/Lib/pathlib/_abc.py b/Lib/pathlib/_abc.py
index 504f9bb0c76f9a..33e963c944fc5f 100644
--- a/Lib/pathlib/_abc.py
+++ b/Lib/pathlib/_abc.py
@@ -302,16 +302,6 @@ def glob(self, pattern, *, case_sensitive=None,
recurse_symlinks=True):
select = globber.selector(parts)
return select(self.joinpath(''))
- def rglob(self, pattern, *, case_sensitive=None, recurse_symlinks=True):
- """Recursively yield all existing files (of any kind, including
- directories) matching the given relative pattern, anywhere in
- this subtree.
- """
- if not isinstance(pattern, JoinablePath):
- pattern = self.with_segments(pattern)
- pattern = '**' / pattern
- return self.glob(pattern, case_sensitive=case_sensitive,
recurse_symlinks=recurse_symlinks)
-
def walk(self, top_down=True, on_error=None, follow_symlinks=False):
"""Walk the directory tree from this directory, similar to
os.walk()."""
paths = [self]
diff --git a/Lib/test/test_pathlib/test_pathlib.py
b/Lib/test/test_pathlib/test_pathlib.py
index 8900b292ad0e46..182d054de9d234 100644
--- a/Lib/test/test_pathlib/test_pathlib.py
+++ b/Lib/test/test_pathlib/test_pathlib.py
@@ -2766,6 +2766,64 @@ def _check(path, glob, expected):
_check(p, "*.txt", ["dirC/novel.txt"])
_check(p, "*.*", ["dirC/novel.txt"])
+ def test_rglob_recurse_symlinks_false(self):
+ def _check(path, glob, expected):
+ actual = set(path.rglob(glob, recurse_symlinks=False))
+ self.assertEqual(actual, { P(self.base, q) for q in expected })
+ P = self.cls
+ p = P(self.base)
+ it = p.rglob("fileA")
+ self.assertIsInstance(it, collections.abc.Iterator)
+ _check(p, "fileA", ["fileA"])
+ _check(p, "fileB", ["dirB/fileB"])
+ _check(p, "**/fileB", ["dirB/fileB"])
+ _check(p, "*/fileA", [])
+
+ if self.can_symlink:
+ _check(p, "*/fileB", ["dirB/fileB", "dirB/linkD/fileB",
+ "linkB/fileB", "dirA/linkC/fileB"])
+ _check(p, "*/", [
+ "dirA/", "dirA/linkC/", "dirB/", "dirB/linkD/", "dirC/",
+ "dirC/dirD/", "dirE/", "linkB/"])
+ else:
+ _check(p, "*/fileB", ["dirB/fileB"])
+ _check(p, "*/", ["dirA/", "dirB/", "dirC/", "dirC/dirD/", "dirE/"])
+
+ _check(p, "file*", ["fileA", "dirB/fileB", "dirC/fileC",
"dirC/dirD/fileD"])
+ _check(p, "", ["", "dirA/", "dirB/", "dirC/", "dirE/", "dirC/dirD/"])
+ p = P(self.base, "dirC")
+ _check(p, "*", ["dirC/fileC", "dirC/novel.txt",
+ "dirC/dirD", "dirC/dirD/fileD"])
+ _check(p, "file*", ["dirC/fileC", "dirC/dirD/fileD"])
+ _check(p, "**/file*", ["dirC/fileC", "dirC/dirD/fileD"])
+ _check(p, "dir*/**", ["dirC/dirD/", "dirC/dirD/fileD"])
+ _check(p, "dir*/**/", ["dirC/dirD/"])
+ _check(p, "*/*", ["dirC/dirD/fileD"])
+ _check(p, "*/", ["dirC/dirD/"])
+ _check(p, "", ["dirC/", "dirC/dirD/"])
+ _check(p, "**", ["dirC/", "dirC/fileC", "dirC/dirD",
"dirC/dirD/fileD", "dirC/novel.txt"])
+ _check(p, "**/", ["dirC/", "dirC/dirD/"])
+ # gh-91616, a re module regression
+ _check(p, "*.txt", ["dirC/novel.txt"])
+ _check(p, "*.*", ["dirC/novel.txt"])
+
+ @needs_posix
+ def test_rglob_posix(self):
+ P = self.cls
+ p = P(self.base, "dirC")
+ q = p / "dirD" / "FILEd"
+ given = set(p.rglob("FILEd"))
+ expect = {q} if q.exists() else set()
+ self.assertEqual(given, expect)
+ self.assertEqual(set(p.rglob("FILEd*")), set())
+
+ @needs_windows
+ def test_rglob_windows(self):
+ P = self.cls
+ p = P(self.base, "dirC")
+ self.assertEqual(set(p.rglob("FILEd")), { P(self.base,
"dirC/dirD/fileD") })
+ self.assertEqual(set(p.rglob("*\\")), { P(self.base, "dirC/dirD/") })
+
@needs_symlinks
def test_rglob_symlink_loop(self):
# Don't get fooled by symlink loops (Issue #26012).
diff --git a/Lib/test/test_pathlib/test_pathlib_abc.py
b/Lib/test/test_pathlib/test_pathlib_abc.py
index c1bdcd03ca88d0..ee4c2b59fb9a39 100644
--- a/Lib/test/test_pathlib/test_pathlib_abc.py
+++ b/Lib/test/test_pathlib/test_pathlib_abc.py
@@ -1136,64 +1136,6 @@ def _check(path, pattern, case_sensitive, expected):
_check(path, "dirb/file*", True, [])
_check(path, "dirb/file*", False, ["dirB/fileB"])
- def test_rglob_recurse_symlinks_false(self):
- def _check(path, glob, expected):
- actual = set(path.rglob(glob, recurse_symlinks=False))
- self.assertEqual(actual, { P(self.base, q) for q in expected })
- P = self.cls
- p = P(self.base)
- it = p.rglob("fileA")
- self.assertIsInstance(it, collections.abc.Iterator)
- _check(p, "fileA", ["fileA"])
- _check(p, "fileB", ["dirB/fileB"])
- _check(p, "**/fileB", ["dirB/fileB"])
- _check(p, "*/fileA", [])
-
- if self.can_symlink:
- _check(p, "*/fileB", ["dirB/fileB", "dirB/linkD/fileB",
- "linkB/fileB", "dirA/linkC/fileB"])
- _check(p, "*/", [
- "dirA/", "dirA/linkC/", "dirB/", "dirB/linkD/", "dirC/",
- "dirC/dirD/", "dirE/", "linkB/"])
- else:
- _check(p, "*/fileB", ["dirB/fileB"])
- _check(p, "*/", ["dirA/", "dirB/", "dirC/", "dirC/dirD/", "dirE/"])
-
- _check(p, "file*", ["fileA", "dirB/fileB", "dirC/fileC",
"dirC/dirD/fileD"])
- _check(p, "", ["", "dirA/", "dirB/", "dirC/", "dirE/", "dirC/dirD/"])
- p = P(self.base, "dirC")
- _check(p, "*", ["dirC/fileC", "dirC/novel.txt",
- "dirC/dirD", "dirC/dirD/fileD"])
- _check(p, "file*", ["dirC/fileC", "dirC/dirD/fileD"])
- _check(p, "**/file*", ["dirC/fileC", "dirC/dirD/fileD"])
- _check(p, "dir*/**", ["dirC/dirD/", "dirC/dirD/fileD"])
- _check(p, "dir*/**/", ["dirC/dirD/"])
- _check(p, "*/*", ["dirC/dirD/fileD"])
- _check(p, "*/", ["dirC/dirD/"])
- _check(p, "", ["dirC/", "dirC/dirD/"])
- _check(p, "**", ["dirC/", "dirC/fileC", "dirC/dirD",
"dirC/dirD/fileD", "dirC/novel.txt"])
- _check(p, "**/", ["dirC/", "dirC/dirD/"])
- # gh-91616, a re module regression
- _check(p, "*.txt", ["dirC/novel.txt"])
- _check(p, "*.*", ["dirC/novel.txt"])
-
- @needs_posix
- def test_rglob_posix(self):
- P = self.cls
- p = P(self.base, "dirC")
- q = p / "dirD" / "FILEd"
- given = set(p.rglob("FILEd"))
- expect = {q} if q.exists() else set()
- self.assertEqual(given, expect)
- self.assertEqual(set(p.rglob("FILEd*")), set())
-
- @needs_windows
- def test_rglob_windows(self):
- P = self.cls
- p = P(self.base, "dirC")
- self.assertEqual(set(p.rglob("FILEd")), { P(self.base,
"dirC/dirD/fileD") })
- self.assertEqual(set(p.rglob("*\\")), { P(self.base, "dirC/dirD/") })
-
def test_info_exists(self):
p = self.cls(self.base)
self.assertTrue(p.info.exists())
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
