Skip to content

gh-145831: email.quoprimime: decode() leaves stray \r when eol='\r\n' #145832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bitdancer merged 6 commits into from
Apr 9, 2026
Merged

gh-145831: email.quoprimime: decode() leaves stray \r when eol='\r\n' #145832

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b25c0e
gh-XXXXX: Fix email.quoprimime.decode() stray CR with eol='\r\n'
stefanzetzsche Feb 22, 2026
9b34b5c
Merge branch 'main' of https://github.com/python/cpython into fix/ema…
stefanzetzsche Mar 11, 2026
948421f
Add tests for quoprimime.decode() with eol=CRLF
stefanzetzsche Mar 11, 2026
d559797
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 11, 2026
8e99df5
Fix NEWS entry: suppress Sphinx cross-reference for undocumented emai…
stefanzetzsche Mar 11, 2026
269a349
Remove unnecessary comments from test case
stefanzetzsche Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add tests for quoprimime.decode() with eol=CRLF
  • Loading branch information
@stefanzetzsche
stefanzetzsche committed Mar 11, 2026
commit 948421f95d2bf656bf4a34ccc47f16ffec2da5e2
11 changes: 11 additions & 0 deletions Lib/test/test_email/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4828,6 +4828,17 @@ def test_decode_soft_line_break(self):
def test_decode_false_quoting(self):
self._test_decode('A=1,B=A ==> A+B==2', 'A=1,B=A ==> A+B==2')

def test_decode_crlf_eol_no_trailing_newline(self):
# decode() with eol='\r\n' should not leave a stray \r
# when the input has no trailing line ending.
self._test_decode('abc', 'abc', eol='\r\n')

def test_decode_crlf_eol_multiline_no_trailing_newline(self):
self._test_decode('a\r\nb', 'a\r\nb', eol='\r\n')

def test_decode_crlf_eol_with_trailing_newline(self):
self._test_decode('abc\r\n', 'abc\r\n', eol='\r\n')

def _test_encode(self, body, expected_encoded_body, maxlinelen=None, eol=None):
kwargs = {}
if maxlinelen is None:
Expand Down
Loading