Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 97e2000

Browse filesBrowse files
committed
bpo-40597: email: Use CTE if lines are longer than max_line_length consistently
RFC5322 in section 2.1.1 mandates that the line cannot be longer than 998 characters and should not be longer than 78 characters (excluding CRLF). When we use raw_data_manager (default for EmailPolicy, EmailMessage) it does the correct thing as long as the message contains characters outside of 7bit US-ASCII set - base64 or qp Content-Transfer-Encoding is applied if the lines would be too long without it. However if our message is limited to the characters from the 7bit US-ASCII set no transfer encoding is applied, and such messages can easily go beyond 78 or even 998 characters. Let's fix the CTE heuristic so it doesn't care about 7bit vs 8bit.
1 parent d5d9a71 commit 97e2000
Copy full SHA for 97e2000

File tree

3 files changed

+23
-7
lines changed
Filter options

3 files changed

+23
-7
lines changed

‎Lib/email/contentmanager.py

Copy file name to clipboardExpand all lines: Lib/email/contentmanager.py
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ def embedded_body(lines): return linesep.join(lines) + linesep
146146
def normal_body(lines): return b'\n'.join(lines) + b'\n'
147147
if cte==None:
148148
# Use heuristics to decide on the "best" encoding.
149-
try:
150-
return '7bit', normal_body(lines).decode('ascii')
151-
except UnicodeDecodeError:
152-
pass
153-
if (policy.cte_type == '8bit' and
154-
max(len(x) for x in lines) <= policy.max_line_length):
155-
return '8bit', normal_body(lines).decode('ascii', 'surrogateescape')
149+
if max(len(x) for x in lines) <= policy.max_line_length:
150+
try:
151+
return '7bit', normal_body(lines).decode('ascii')
152+
except UnicodeDecodeError:
153+
pass
154+
if policy.cte_type == '8bit':
155+
return '8bit', normal_body(lines).decode('ascii', 'surrogateescape')
156156
sniff = embedded_body(lines[:10])
157157
sniff_qp = quoprimime.body_encode(sniff.decode('latin-1'),
158158
policy.max_line_length)

‎Lib/test/test_email/test_contentmanager.py

Copy file name to clipboardExpand all lines: Lib/test/test_email/test_contentmanager.py
+15Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,21 @@ def test_set_text_charset_latin_1(self):
329329
self.assertEqual(m.get_payload(decode=True).decode('utf-8'), content)
330330
self.assertEqual(m.get_content(), content)
331331

332+
def test_set_text_plain_long_line_heuristics(self):
333+
m = self._make_message()
334+
content = ("Simple but long message that is over 78 characters"
335+
" long to force transfer encoding.\n")
336+
raw_data_manager.set_content(m, content)
337+
self.assertEqual(str(m), textwrap.dedent("""\
338+
Content-Type: text/plain; charset="utf-8"
339+
Content-Transfer-Encoding: quoted-printable
340+
341+
Simple but long message that is over 78 characters long to =
342+
force transfer encoding.
343+
"""))
344+
self.assertEqual(m.get_payload(decode=True).decode('utf-8'), content)
345+
self.assertEqual(m.get_content(), content)
346+
332347
def test_set_text_short_line_minimal_non_ascii_heuristics(self):
333348
m = self._make_message()
334349
content = "et là il est monté sur moi et il commence à m'éto.\n"
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
If text content lines are longer than policy.max_line_length, always use a content-encoding to make sure they are wrapped.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.