Skip to content

gh-159858: Fix memoryview payloads with 7bit, 8bit and binary email CTEs #159859

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

Open
NikitaMikhailov wants to merge 2 commits into
base: main
Choose a base branch
from
+28 −2
Open

gh-159858: Fix memoryview payloads with 7bit, 8bit and binary email CTEs #159859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9332d20
Fix memoryview payloads with unencoded email CTEs
NikitaMikhailov Oct 16, 2026
8f9023b
gh-159858: Add NEWS for email memoryview payload fix
NikitaMikhailov Oct 20, 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
4 changes: 2 additions & 2 deletions Lib/email/contentmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,9 @@ def set_bytes_content(msg, data, maintype, subtype, cte='base64',
data = binascii.b2a_qp(data, istext=False, header=False, quotetabs=True)
data = data.decode('ascii')
elif cte == '7bit':
data = data.decode('ascii')
data = str(data, 'ascii')
elif cte in ('8bit', 'binary'):
data = data.decode('ascii', 'surrogateescape')
data = str(data, 'ascii', 'surrogateescape')
msg.set_payload(data)
msg['Content-Transfer-Encoding'] = cte
_finalize_set(msg, disposition, filename, cid, params)
Expand Down
23 changes: 23 additions & 0 deletions Lib/test/test_email/test_contentmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,29 @@ def test_set_content_bytes_cte_7bit(self):
ASCII-only message.
"""))

def test_set_byteslike_content_with_unencoded_cte(self):
for cte in ('7bit', '8bit', 'binary'):
content = (b'ASCII-only message.\n' if cte == '7bit' else
b'non-ASCII \xa7\xff message.\r\n')
for buffer_type in (bytes, bytearray, memoryview):
with self.subTest(cte=cte, buffer_type=buffer_type):
m = self._make_message()
m.set_content(buffer_type(content),
maintype='application',
subtype='octet-stream', cte=cte)
self.assertEqual(m['Content-Transfer-Encoding'], cte)
self.assertEqual(m.get_payload(decode=True), content)
self.assertEqual(m.get_content(), content)

def test_set_byteslike_non_ascii_with_cte_7bit_raises(self):
for buffer_type in (bytes, bytearray, memoryview):
with self.subTest(buffer_type=buffer_type):
m = self._make_message()
with self.assertRaises(UnicodeDecodeError):
m.set_content(buffer_type(b'non-ASCII \xa7\xff message'),
maintype='application',
subtype='octet-stream', cte='7bit')

content_object_params = {
'text_plain': ('content', ()),
'text_html': ('content', ('html',)),
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2026-10-20-00-00-00.gh-issue-159858.CQw9me.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix :meth:`email.message.EmailMessage.set_content` raising
:exc:`AttributeError` for :class:`memoryview` payloads with the ``7bit``,
``8bit``, or ``binary`` content transfer encoding.
Loading