Skip to content

GH-102613: Improve performance of pathlib.Path.rglob() #104244

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 4 commits into from
May 7, 2023
Merged

GH-102613: Improve performance of pathlib.Path.rglob() #104244

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3d0923
GH-102613: Improve performance of `pathlib.Path.rglob()`
barneygale May 6, 2023
f235d66
Add some tests for de-duplicating recursive globs.
barneygale May 6, 2023
79337a1
Simplify test condition
barneygale May 6, 2023
7bee0cf
Slice pattern_parts only once.
barneygale May 7, 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
Add some tests for de-duplicating recursive globs.
  • Loading branch information
@barneygale
barneygale committed May 6, 2023
commit f235d669fbe5b9111935193cc052d2a94e7a929e
8 changes: 7 additions & 1 deletion Lib/test/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,13 +1852,16 @@ def _check(path, pattern, case_sensitive, expected):

def test_rglob_common(self):
def _check(glob, expected):
self.assertEqual(set(glob), { P(BASE, q) for q in expected })
actual = list(glob)
self.assertEqual(set(actual), { P(BASE, q) for q in expected })
self.assertEqual(len(actual), len(expected))
P = self.cls
p = P(BASE)
it = p.rglob("fileA")
self.assertIsInstance(it, collections.abc.Iterator)
_check(it, ["fileA"])
_check(p.rglob("fileB"), ["dirB/fileB"])
_check(p.rglob("**/fileB"), ["dirB/fileB"])
_check(p.rglob("*/fileA"), [])
if not os_helper.can_symlink():
_check(p.rglob("*/fileB"), ["dirB/fileB"])
Expand All @@ -1882,9 +1885,12 @@ def _check(glob, expected):
_check(p.rglob("*"), ["dirC/fileC", "dirC/novel.txt",
"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"])
_check(p.rglob("*/*"), ["dirC/dirD/fileD"])
_check(p.rglob("*/"), ["dirC/dirD"])
_check(p.rglob(""), ["dirC", "dirC/dirD"])
_check(p.rglob("**"), ["dirC", "dirC/dirD"])
# gh-91616, a re module regression
_check(p.rglob("*.txt"), ["dirC/novel.txt"])
_check(p.rglob("*.*"), ["dirC/novel.txt"])
Expand Down