FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

GH-119169: Speed up `os.fwalk(topdown=False)` by barneygale · Pull Request #121433 · python/cpython · GitHub

/ cpython Public

GH-119169: Speed up os.fwalk(topdown=False) #121433

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

Closed
barneygale wants to merge 2 commits into from
+10 −13
Conversation 1 Commits 2 Checks 0 Files changed 2
Closed

GH-119169: Speed up os.fwalk(topdown=False) #121433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bedf76e
GH-119169: Speed up `os.fwalk(topdown=False)`
barneygale Jul 6, 2024
5325507
Extraneous comment.
barneygale Jul 6, 2024
File filter

Filter by extension

Filter by extension .py  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
22 changes: 9 additions & 13 deletions Lib/os.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -542,16 +542,21 @@ def _fwalk(stack, isbytes, topdown, onerror, follow_symlinks):
scandir_it = scandir(topfd)
dirs = []
nondirs = []
entries = None if topdown or follow_symlinks else []
topprefix = path.join(toppath, toppath[:0]) # Add trailing slash.
if not topdown:
stack.append((_fwalk_yield, (toppath, dirs, nondirs, topfd)))
for entry in scandir_it:
name = entry.name
if isbytes:
name = fsencode(name)
try:
if entry.is_dir():
dirs.append(name)
if entries is not None:
entries.append(entry)
if not topdown:
stack.append(
(_fwalk_walk, (
False, topfd, topprefix + name, name,
None if follow_symlinks else entry)))
else:
nondirs.append(name)
except OSError:
Expand All @@ -564,18 +569,9 @@ def _fwalk(stack, isbytes, topdown, onerror, follow_symlinks):

if topdown:
yield toppath, dirs, nondirs, topfd
else:
stack.append((_fwalk_yield, (toppath, dirs, nondirs, topfd)))

toppath = path.join(toppath, toppath[:0]) # Add trailing slash.
if entries is None:
stack.extend(
(_fwalk_walk, (False, topfd, toppath + name, name, None))
(_fwalk_walk, (False, topfd, topprefix + name, name, None))
for name in dirs[::-1])
else:
stack.extend(
(_fwalk_walk, (False, topfd, toppath + name, name, entry))
for name, entry in zip(dirs[::-1], entries[::-1]))

__all__.append("fwalk")

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-07-06-15-31-01.gh-issue-119169.bfpdsr.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Speed up :func:`os.fwalk` in bottom-up mode.
Back | FazBrowse Home | New Git URL