Refs #22561 -- Measured email long lines on encoded content #7803
Conversation
This file contains 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
timgraham
approved these changes
Jan 6, 2017
| @@ -219,7 +219,9 @@ def __setitem__(self, name, val): | |||
|
|
|||
| def set_payload(self, payload, charset=None): | |||
| if charset == 'utf-8': | |||
| has_long_lines = any(len(l) > RFC5322_EMAIL_LINE_LENGTH_LIMIT for l in payload.splitlines()) | |||
| has_long_lines = any( | |||
| len(l.encode('utf-8')) > RFC5322_EMAIL_LINE_LENGTH_LIMIT for l in payload.splitlines() | |||
There was a problem hiding this comment.
for .... could go on the next line to balance things out
| @@ -779,7 +779,8 @@ def test_send_long_lines(self): | |||
| Message body containing longer lines are converted to Quoted-Printable | |||
| to avoid having to insert newlines, which could be hairy to do properly. | |||
| """ | |||
| email = EmailMessage('Subject', "Comment ça va? " * 100, 'from@example.com', ['to@example.com']) | |||
| # The body length is < 998 (840) when unencoded, but > 998 when utf-8 encoded. | |||
There was a problem hiding this comment.
To make the comment fit on one line: (no comma needed since what comes after isn't an independent clause)
# Unencoded body length is < 998 (840) but > 998 when utf-8 encoded.
| @@ -779,7 +779,8 @@ def test_send_long_lines(self): | |||
| Message body containing longer lines are converted to Quoted-Printable | |||
| to avoid having to insert newlines, which could be hairy to do properly. | |||
| """ | |||
| email = EmailMessage('Subject', "Comment ça va? " * 100, 'from@example.com', ['to@example.com']) | |||
| # The body length is < 998 (840) when unencoded, but > 998 when utf-8 encoded. | |||
| email = EmailMessage('Subject', "В южных морях " * 60, 'from@example.com', ['to@example.com']) | |||
There was a problem hiding this comment.
Could use single quotes for consistency.
|
Should it be backported to 1.10? |
|
I don't think it's a regression, neither a bug in a new feature. Just a better fixed bug... |
Thanks Pavel Pokrovskiy for the report and Tim Graham for the review.
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.
Thanks Pavel Pokrovskiy for the report.