gh-98188: Fix EmailMessage.get_payload to decode data#127547
Merged
bitdancer merged 7 commits intopython:mainfrom Jan 6, 2025
Merged
gh-98188: Fix EmailMessage.get_payload to decode data#127547bitdancer merged 7 commits intopython:mainfrom
bitdancer merged 7 commits intopython:mainfrom
Conversation
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.
Fix
email.message.EmailMessage.get_payloadfailing to decode data when there is trailing whitespace and/or extra text following the<mechanism>ofContent-Transfer-EncodingThe header.defects attribute does have an
InvalidHeaderDefecterror, butheader.cteis still a valid mechanism. Therefore, it is better to decode the content even if there is an error.The fix in ietf-tools/mailarchive#3550 overrides the
__str__method to return theself.cte, which resolves this issue. However, it might have some backward compatibility issues. So, it is better to ensurestr(header)still returns the original value while usingheader.cteto retrieve the parsed CTE in theget_payload(decode=True)method.The output of
msg.get_payload(decode=True)isb'Hello. Testing'after this fix