Improved flexibility of XMP parsing#7274
Merged
hugovk merged 4 commits intopython-pillow:mainfrom Oct 6, 2023
Merged
Conversation
hugovk
reviewed
Oct 5, 2023
Tests/test_file_jpeg.py
Outdated
| def test_getxmp_no_prefix(self): | ||
| with Image.open("Tests/images/xmp_no_prefix.jpg") as im: | ||
| if ElementTree is None: | ||
| with pytest.warns(UserWarning): |
Member
Author
There was a problem hiding this comment.
ElementTree is None if defusedxml is unavailable, triggering this warning.
Lines 1410 to 1411 in 1e7dcd3
Member
There was a problem hiding this comment.
OK, let's also add a match= to pytest.warns to make it a bit clearer (this and the other one).
Member
Author
There was a problem hiding this comment.
Sure, done, and I've added it to other locations as well.
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
2 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.
Resolves #7273
Resolves #7324
The JPEG XMP code was originally added in #5144. The image in #7273 differs in that it is padded at the end with b"\x00". I've updated the JpegImagePlugin code to allow for that.
The image in #7273 also has an attribute name that doesn't contain a semicolon. Normally, the tags do, and leads to the start of the tag being surrounded with curly brackets. Their absence causes an error at the moment, so I've also added a commit to allow for that.
I created the test files by copying the XMP data from Tests/images/xmp_test.jpg, modifying it to trigger these conditions, and saving new images with a modified Pillow.