Skip to content

GH-119169: Simplify os.fwalk() exception handling #121432

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

Open
barneygale wants to merge 3 commits into
base: main
Choose a base branch
from
Open

GH-119169: Simplify os.fwalk() exception handling #121432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d18bfb9
GH-119169: Slightly speed up `os.fwalk()`
barneygale Jul 6, 2024
bf82495
Merge branch 'main' into os-fwalk-speedup
barneygale Jul 8, 2024
1b4fb10
Simplify diff
barneygale Jul 8, 2024
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
Next Next commit
GH-119169: Slightly speed up os.fwalk() 
Handle "disappearing" files as in `walk()`: add them to the `nondirs` list
rather than omitting them entirely.
  • Loading branch information
@barneygale
barneygale committed Jul 6, 2024
commit d18bfb95522364a542984006edae13bc4ee87636
21 changes: 9 additions & 12 deletions Lib/os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,19 +548,16 @@ def _fwalk(stack, isbytes, topdown, onerror, follow_symlinks):
if isbytes:
name = fsencode(name)
try:
if entry.is_dir():
dirs.append(name)
if entries is not None:
entries.append(entry)
else:
nondirs.append(name)
is_dir = entry.is_dir()
except OSError:
try:
# Add dangling symlinks, ignore disappeared files
if entry.is_symlink():
nondirs.append(name)
except OSError:
pass
is_dir = False

if is_dir:
dirs.append(name)
if entries is not None:
entries.append(entry)
else:
nondirs.append(name)

if topdown:
yield toppath, dirs, nondirs, topfd
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2024-07-06-15-19-20.gh-issue-119169.v_JQyl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Slightly speed up :func:`os.fwalk` by simplifying handling of inaccessible
files.