https://github.com/python/cpython/commit/37651cfbce514a8daed75a8c63d6889081a63a23
commit: 37651cfbce514a8daed75a8c63d6889081a63a23
branch: main
author: Barney Gale <[email protected]>
committer: barneygale <[email protected]>
date: 2024-11-01T18:52:00Z
summary:
GH-125413: pathlib ABCs: use `scandir()` to speed up `walk()` (#126262)
Use the new `PathBase.scandir()` method in `PathBase.walk()`, which greatly
reduces the number of `PathBase.stat()` calls needed when walking.
There are no user-facing changes, because the pathlib ABCs are still
private and `Path.walk()` doesn't use the implementation in its superclass.
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 cc7c1991d0e528..f5eed6f025c250 100644
--- a/Lib/pathlib/_abc.py
+++ b/Lib/pathlib/_abc.py
@@ -693,16 +693,18 @@ def walk(self, top_down=True, on_error=None,
follow_symlinks=False):
if not top_down:
paths.append((path, dirnames, filenames))
try:
- for child in path.iterdir():
- try:
- if child.is_dir(follow_symlinks=follow_symlinks):
- if not top_down:
- paths.append(child)
- dirnames.append(child.name)
- else:
- filenames.append(child.name)
- except OSError:
- filenames.append(child.name)
+ with path.scandir() as entries:
+ for entry in entries:
+ name = entry.name
+ try:
+ if entry.is_dir(follow_symlinks=follow_symlinks):
+ if not top_down:
+ paths.append(path.joinpath(name))
+ dirnames.append(name)
+ else:
+ filenames.append(name)
+ except OSError:
+ filenames.append(name)
except OSError as error:
if on_error is not None:
on_error(error)
diff --git a/Lib/test/test_pathlib/test_pathlib_abc.py
b/Lib/test/test_pathlib/test_pathlib_abc.py
index 4596d0b0e26763..4ab804850e9c3e 100644
--- a/Lib/test/test_pathlib/test_pathlib_abc.py
+++ b/Lib/test/test_pathlib/test_pathlib_abc.py
@@ -1951,7 +1951,7 @@ def ordered_walk(path):
if self.can_symlink:
# Add some symlinks
source.joinpath('linkC').symlink_to('fileC')
- source.joinpath('linkD').symlink_to('dirD')
+ source.joinpath('linkD').symlink_to('dirD',
target_is_directory=True)
# Perform the copy
target = base / 'copyC'
@@ -2969,7 +2969,7 @@ def setUpWalk(self):
f.write(f"I'm {path} and proud of it. Blame test_pathlib.\n")
if self.can_symlink:
- self.link_path.symlink_to(t2_path)
+ self.link_path.symlink_to(t2_path, target_is_directory=True)
broken_link_path.symlink_to('broken')
broken_link2_path.symlink_to(self.cls('tmp3', 'broken'))
self.sub2_tree = (self.sub2_path, [], ["broken_link",
"broken_link2", "link", "tmp3"])
_______________________________________________
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]
