Repository navigation
Conversation
Config.from_file() was missing errno.ENOTDIR in its silent error handling, while Config.from_pyfile() correctly includes it. When a component of the config file path is a regular file rather than a directory (e.g., trying to load 'file/config.json' where 'file' is a regular file), from_file(silent=True) would raise an OSError instead of silently returning False. This adds ENOTDIR to match from_pyfile's behavior and adds a test to verify the fix. Fixes #5912
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
Config.from_file()is missingerrno.ENOTDIRin its silent error handling, whileConfig.from_pyfile()correctly includes it.When a component of the config file path is a regular file rather than a directory (e.g., trying to load
file/config.jsonwherefileis a regular file),from_file(silent=True)raises anOSErrorinstead of silently returningFalse.This inconsistency was originally reported in #5912.
Changes
errno.ENOTDIRto the error check infrom_file(), matching the existing behavior offrom_pyfile()(line 211).test_config_from_file_not_a_directoryto verify the fix.Before
After
Both methods now handle the same errno values consistently.