Skip to content

[3.10] bpo-41402: Fix email ContentManager calling .encode() on bytes (GH-21631) #27686

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
miss-islington merged 1 commit into from
Aug 9, 2021
Merged

[3.10] bpo-41402: Fix email ContentManager calling .encode() on bytes (GH-21631) #27686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 3 deletions Lib/email/contentmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,7 @@ 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':
# Make sure it really is only ASCII. The early warning here seems
# worth the overhead...if you care write your own content manager :).
data.encode('ascii')
data = data.decode('ascii')
elif cte in ('8bit', 'binary'):
data = data.decode('ascii', 'surrogateescape')
msg.set_payload(data)
Expand Down
12 changes: 12 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 @@ -776,6 +776,18 @@ def test_set_non_ascii_filename(self):
foo
""").encode('ascii'))

def test_set_content_bytes_cte_7bit(self):
m = self._make_message()
m.set_content(b'ASCII-only message.\n',
maintype='application', subtype='octet-stream', cte='7bit')
self.assertEqual(str(m), textwrap.dedent("""\
Content-Type: application/octet-stream
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0

ASCII-only message.
"""))

content_object_params = {
'text_plain': ('content', ()),
'text_html': ('content', ('html',)),
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2020-07-26-18-17-30.bpo-41402.YRkVkp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix :meth:`email.message.EmailMessage.set_content` when called with binary data and ``7bit`` content transfer encoding.