p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11859 from bluetech/numbered-dir-scandir 

pathlib: speed up `make_numbered_dir` given a large tmp root
This commit is contained in:
Ran Benita 2024-01-28 00:05:39 +02:00 committed by GitHub
parent d0f427aec4 eb9013d42c
commit e7b43b2121
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/_pytest/pathlib.py
View File

@ -171,23 +171,23 @@ def rm_rf(path: Path) -> None:
shutil.rmtree(str(path), onerror=onerror) shutil.rmtree(str(path), onerror=onerror)
def find_prefixed(root: Path, prefix: str) -> Iterator[Path]: def find_prefixed(root: Path, prefix: str) -> Iterator["os.DirEntry[str]"]:
"""Find all elements in root that begin with the prefix, case insensitive.""" """Find all elements in root that begin with the prefix, case insensitive."""
l_prefix = prefix.lower() l_prefix = prefix.lower()
for x in root.iterdir(): for x in os.scandir(root):
if x.name.lower().startswith(l_prefix): if x.name.lower().startswith(l_prefix):
yield x yield x
def extract_suffixes(iter: Iterable[PurePath], prefix: str) -> Iterator[str]: def extract_suffixes(iter: Iterable["os.DirEntry[str]"], prefix: str) -> Iterator[str]:
"""Return the parts of the paths following the prefix. """Return the parts of the paths following the prefix.
:param iter: Iterator over path names. :param iter: Iterator over path names.
:param prefix: Expected prefix of the path names. :param prefix: Expected prefix of the path names.
""" """
p_len = len(prefix) p_len = len(prefix)
for p in iter: for entry in iter:
yield p.name[p_len:] yield entry.name[p_len:]
def find_suffixes(root: Path, prefix: str) -> Iterator[str]: def find_suffixes(root: Path, prefix: str) -> Iterator[str]:
@ -346,12 +346,12 @@ def cleanup_candidates(root: Path, prefix: str, keep: int) -> Iterator[Path]:
"""List candidates for numbered directories to be removed - follows py.path.""" """List candidates for numbered directories to be removed - follows py.path."""
max_existing = max(map(parse_num, find_suffixes(root, prefix)), default=-1) max_existing = max(map(parse_num, find_suffixes(root, prefix)), default=-1)
max_delete = max_existing - keep max_delete = max_existing - keep
paths = find_prefixed(root, prefix) entries = find_prefixed(root, prefix)
paths, paths2 = itertools.tee(paths) entries, entries2 = itertools.tee(entries)
numbers = map(parse_num, extract_suffixes(paths2, prefix)) numbers = map(parse_num, extract_suffixes(entries2, prefix))
for path, number in zip(paths, numbers): for entry, number in zip(entries, numbers):
if number <= max_delete: if number <= max_delete:
yield path yield Path(entry)
def cleanup_dead_symlinks(root: Path): def cleanup_dead_symlinks(root: Path):