Fix scandir() crash by returning [] when directory is not found (#13083) #13086
+36
−3
Conversation
This file contains 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
psf-chronographer
bot
added
the
bot:chronographer:provided
for more information, see https://pre-commit.ci
nicoddemus
reviewed
Dec 26, 2024
nicoddemus
reviewed
Dec 26, 2024
nicoddemus
reviewed
Dec 26, 2024
| entries.append(entry) | ||
| entries.sort(key=sort_key) # type: ignore[arg-type] | ||
| return entries | ||
| try: |
There was a problem hiding this comment.
I would prefer a narrow try/except as done in #13084, can you please update to use a similar solution?
There was a problem hiding this comment.
I would prefer a narrow try/except as done in #13084, can you please update to use a similar solution?
Yes, of course
Co-authored-by: Bruno Oliveira <[email protected]>
Co-authored-by: Bruno Oliveira <[email protected]>
for more information, see https://pre-commit.ci
Tusenka
approved these changes
Dec 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR addresses issue #13083 by modifying the scandir function to handle the case where a non-existent directory is provided. Previously, the function did not return a result for such cases, potentially leading to unhandled errors. Now, if the directory does not exist, the function will return an empty list instead.
Changes made:
Updated scandir to catch FileNotFoundError and return an empty list if the directory does not exist.
Updated the function docstring to reflect the new behavior.
Testing:
Also two tests were added.
Closes #13083