diff --git a/Lib/email/contentmanager.py b/Lib/email/contentmanager.py
index b4f5830beada4a..56cdd639c629c3 100644
--- a/Lib/email/contentmanager.py
+++ b/Lib/email/contentmanager.py
@@ -2,6 +2,7 @@
import email.charset
import email.message
import email.errors
+import sys
from email import quoprimime
class ContentManager:
@@ -142,13 +143,15 @@ def _encode_base64(data, max_line_length):
def _encode_text(string, charset, cte, policy):
+ # If max_line_length is 0 or None, there is no limit.
+ maxlen = policy.max_line_length or sys.maxsize
lines = string.encode(charset).splitlines()
linesep = policy.linesep.encode('ascii')
def embedded_body(lines): return linesep.join(lines) + linesep
def normal_body(lines): return b'\n'.join(lines) + b'\n'
if cte is None:
# Use heuristics to decide on the "best" encoding.
- if max((len(x) for x in lines), default=0) <= policy.max_line_length:
+ if max((len(x) for x in lines), default=0) <= maxlen:
try:
return '7bit', normal_body(lines).decode('ascii')
except UnicodeDecodeError:
@@ -156,8 +159,7 @@ def normal_body(lines): return b'\n'.join(lines) + b'\n'
if policy.cte_type == '8bit':
return '8bit', normal_body(lines).decode('ascii', 'surrogateescape')
sniff = embedded_body(lines[:10])
- sniff_qp = quoprimime.body_encode(sniff.decode('latin-1'),
- policy.max_line_length)
+ sniff_qp = quoprimime.body_encode(sniff.decode('latin-1'), maxlen)
sniff_base64 = binascii.b2a_base64(sniff)
# This is a little unfair to qp; it includes lineseps, base64 doesn't.
if len(sniff_qp) > len(sniff_base64):
@@ -172,9 +174,9 @@ def normal_body(lines): return b'\n'.join(lines) + b'\n'
data = normal_body(lines).decode('ascii', 'surrogateescape')
elif cte == 'quoted-printable':
data = quoprimime.body_encode(normal_body(lines).decode('latin-1'),
- policy.max_line_length)
+ maxlen)
elif cte == 'base64':
- data = _encode_base64(embedded_body(lines), policy.max_line_length)
+ data = _encode_base64(embedded_body(lines), maxlen)
else:
raise ValueError("Unknown content transfer encoding {}".format(cte))
return cte, data
diff --git a/Lib/test/test_email/test_message.py b/Lib/test/test_email/test_message.py
index 23c39775a8b2e5..6d2e2a082a29c5 100644
--- a/Lib/test/test_email/test_message.py
+++ b/Lib/test/test_email/test_message.py
@@ -1004,6 +1004,32 @@ def test_folding_with_long_nospace_http_policy_1(self):
parsed_msg = message_from_bytes(m.as_bytes(), policy=policy.default)
self.assertEqual(parsed_msg['Message-ID'], m['Message-ID'])
+ def test_no_wrapping_max_line_length(self):
+ # Test that falsey 'max_line_length' are converted to sys.maxsize.
+ for n in [0, None]:
+ with self.subTest(max_line_length=n):
+ self.do_test_no_wrapping_max_line_length(n)
+
+ def do_test_no_wrapping_max_line_length(self, falsey):
+ self.assertFalse(falsey)
+ pol = policy.default.clone(max_line_length=falsey)
+ subj = "S" * 100
+ body = "B" * 100
+ msg = EmailMessage(policy=pol)
+ msg["From"] = "a@ex.com"
+ msg["To"] = "b@ex.com"
+ msg["Subject"] = subj
+ msg.set_content(body)
+
+ raw = msg.as_bytes()
+ self.assertNotIn(b"=\n", raw,
+ "Found fold indicator; wrapping not disabled")
+
+ parsed = message_from_bytes(raw, policy=policy.default)
+ self.assertEqual(parsed["Subject"], subj)
+ parsed_body = parsed.get_body().get_content().rstrip('\n')
+ self.assertEqual(parsed_body, body)
+
def test_invalid_header_names(self):
invalid_headers = [
('Invalid Header', 'contains space'),
diff --git a/Misc/NEWS.d/next/Library/2025-06-10-18-02-29.gh-issue-135307.fXGrcK.rst b/Misc/NEWS.d/next/Library/2025-06-10-18-02-29.gh-issue-135307.fXGrcK.rst
new file mode 100644
index 00000000000000..930b5813770c23
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-06-10-18-02-29.gh-issue-135307.fXGrcK.rst
@@ -0,0 +1,2 @@
+:mod:`email`: Ensure policy accepts unlimited line lengths by
+treating falsey values as :data:`sys.maxsize`.
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy