narrow marshal.load except in _read_pyc to expected exceptions#14642
Closed
HrachShah wants to merge 1 commit into
Closed
narrow marshal.load except in _read_pyc to expected exceptions#14642HrachShah wants to merge 1 commit into
HrachShah wants to merge 1 commit into
Conversation
Member
|
closing as unattended ai slop based on the pr content, timeline and user profile |
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 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.
Summary
Tighten the bare
except Exceptionaroundmarshal.loadin_read_pycto the narrow tuple(EOFError, ValueError, TypeError, OSError).What changes
src/_pytest/assertion/rewrite.py:_read_pycpreviously wrappedmarshal.load(fp)inexcept Exception. Per the Python docs,marshal.loadonly raisesEOFError(truncated code),ValueError(unmarshalable object),TypeError(unsupported type code), orOSError(read failure on the file). The bareexceptwas also catchingKeyboardInterruptandSystemExit, masking Ctrl-C during a slow import and silently convertingAttributeError/MemoryErrorfrom a future bug in the marshal call chain into a benign "return None" that masked the real problem.Tests
python -m pytest testing/test_assertrewrite.py -k read_pyc -v # 4 passed