gh-135307: Fix email error when policy max_line_length is set to 0 or None #135367
Conversation
[pull] main from python:main
Misc/NEWS.d/next/Library/2025-06-10-18-02-29.gh-issue-135307.fXGrcK.rst
Outdated
Show resolved
Hide resolved
|
Haha, nice catch lol |
Lib/test/test_email/test_message.py
Outdated
| def test_no_wrapping_with_none_max_line_length(self): | ||
| pol = policy.default.clone(max_line_length=None) | ||
| subj = "S" * 100 | ||
| body = "B" * 100 |
There was a problem hiding this comment.
Maybe we should use some bigger number? Because word "unlimited" is present. Something like 10**7, for example.
There was a problem hiding this comment.
I don't think it's necessary, here we just want to test if it will wrap the context to the default 78 characters. 0 / None is set it to no wrap mode. This is a similar fix logic as _refold_parse_tree so I mentioned 'unlimited' as there, but it actually takes sys.maxsize. Thanks for comment.
Misc/NEWS.d/next/Library/2025-06-10-18-02-29.gh-issue-135307.fXGrcK.rst
Outdated
Show resolved
Hide resolved
|
@picnixz Thanks for your detailed review. I addressed all the issues you mentioned in the new commit. |
| 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: |
There was a problem hiding this comment.
We can use: max(map(len, lines), default=0), though I'm not sure which is the fastest and which is the most "readable".
@bitdancer What is the style you'd recommend in general in the email package? would you rather for readability, succintness, or performance?
There was a problem hiding this comment.
Just my comment: we're not required to take the fastest route here, since we may not have a heavy load on the email module. Still wish to hear more comments before we resolve this :)
|
Hi everyone, sorry to bother you. Is there any update on this PR? |
| @@ -142,22 +143,23 @@ def _encode_base64(data, max_line_length): | |||
|
|
|||
|
|
|||
| def _encode_text(string, charset, cte, policy): | |||
| # max_line_length 0/None means no limit, ie: infinitely long. | |||
There was a problem hiding this comment.
| # max_line_length 0/None means no limit, ie: infinitely long. | |
| # If max_line_length is 0 or None, there is no limit. |
| self.assertNotIn(b"\r\n ", raw, | ||
| "Found fold indicator; wrapping not disabled") |
There was a problem hiding this comment.
Why we check on b"\r\n " not to be present?
Maybe it should be soft_break from quoprimime.body_encode, i.e. b"=\n"?
email.policy.Policy.max_line_lengthis falsey #135307