[3.15] gh-156002: Keep reading through monkey-patched zipfile decompressors (GH-157180) - #157268
Merged
Merged
Conversation
…ecompressors (pythonGH-157180) pythonGH-156003 made ZipExtFile._read1() call decompress(data, max_length) on non-deflate decompressors and consult needs_input before reading more. A decompressor installed by monkey-patching _get_decompressor() (as projects like zipfile-zstd, zipfile-deflate64, ... do) may support neither, and every read through it then failed with AttributeError. - Make LZMADecompressor.needs_input public to simplify implementation. - Make the needs_input attribute optional. - If `decompress()` fails with TypeError, try again with one argument. - Since the fallback to one-argument call is a maintenance burden, raise DeprecationWarning. - Add tests for future changes, so we can make informed decisions about breaking monkey-patchers. (cherry picked from commit e2311cf) Co-authored-by: rasmusfaber <rfaber@gmail.com> Co-authored-by: Petr Viktorin <encukou@gmail.com>
Member
Author
Member
|
In it goes, thanks! |
|
GH-157557 is a backport of this pull request to the 3.14 branch. |
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
3 participants
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.
GH-156003 made
ZipExtFile._read1()calldecompress(data, max_length)on non-deflate decompressors and consultneeds_inputbefore reading more. A decompressor installed by monkey-patching_get_decompressor()(as projects likezipfile-zstd,zipfile-deflate64, ... do) may support neither, and every read through it then failed with AttributeError.decompress()fails with TypeError, try again with one argument.The backport omits emitting a
DeprecationWarning.