FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-120946: Add MIME-Version when making EmailMessage multipart by limadog9 · Pull Request #159852 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-120946: Add MIME-Version when making EmailMessage multipart #159852

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
limadog9 wants to merge 1 commit into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
+37 −3
Conversation 0 Commits 1 Checks 54 Files changed 3
Open

gh-120946: Add MIME-Version when making EmailMessage multipart #159852

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 .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
5 changes: 5 additions & 0 deletions Lib/email/message.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,11 @@ def clear_content(self):

class EmailMessage(MIMEPart):

def _make_multipart(self, subtype, disallowed_subtypes, boundary):
super()._make_multipart(subtype, disallowed_subtypes, boundary)
if 'MIME-Version' not in self:
self['MIME-Version'] = '1.0'

def set_content(self, *args, **kw):
super().set_content(*args, **kw)
if 'MIME-Version' not in self:
Expand Down
33 changes: 30 additions & 3 deletions Lib/test/test_email/test_message.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,8 @@ def _check_make_multipart(self, m, msg_headers, payload):
if not name.lower().startswith('content-'):
self.assertEqual(m[name], value)
count += 1
if isinstance(m, EmailMessage):
count += 1 # MIME-Version added when making multipart.
self.assertEqual(len(m), count+1) # +1 for new Content-Type
part = next(m.iter_parts())
count = 0
Expand All @@ -631,9 +633,11 @@ def subtype_as_make(self, method, subtype, outcome):
self.assertEqual(m.get_content_subtype(), method)
if subtype == 'no_content':
self.assertEqual(len(m.get_payload()), 0)
self.assertEqual(m.items(),
msg_headers + [('Content-Type',
'multipart/'+method)])
expected_headers = msg_headers + [('Content-Type',
'multipart/'+method)]
if isinstance(m, EmailMessage):
expected_headers.append(('MIME-Version', '1.0'))
self.assertEqual(m.items(), expected_headers)
else:
self.assertEqual(len(m.get_payload()), 1)
self._check_make_multipart(m, msg_headers, payload)
Expand Down Expand Up @@ -781,6 +785,22 @@ def get_payload_surrogate_as_gh_94606(self, msg, expected):
class TestEmailMessage(TestEmailMessageBase, TestEmailBase):
message = EmailMessage

def test_make_multipart_MIME_Version(self):
for subtype in ('related', 'alternative', 'mixed'):
for version in (None, '1.0'):
with self.subTest(subtype=subtype, version=version):
m = self.message()
if version is not None:
m['MIME-Version'] = version
getattr(m, 'make_' + subtype)()
self.assertEqual(m.get_all('MIME-Version'), ['1.0'])

def test_add_related_adds_MIME_Version(self):
m = self.message()
m.add_related(b'image', 'image', 'png', cid='image')
self.assertEqual(m.get_all('MIME-Version'), ['1.0'])
self.assertEqual(m.get_content_type(), 'multipart/related')

def test_set_content_adds_MIME_Version(self):
m = self._str_msg('')
cm = self._TestContentManager()
Expand Down Expand Up @@ -1116,6 +1136,13 @@ class TestMIMEPart(TestEmailMessageBase, TestEmailBase):
# the full tests so that any future drift doesn't introduce bugs.
message = MIMEPart

def test_make_multipart_does_not_add_MIME_Version(self):
for subtype in ('related', 'alternative', 'mixed'):
with self.subTest(subtype=subtype):
m = self.message()
getattr(m, 'make_' + subtype)()
self.assertNotIn('MIME-Version', m)

def test_set_content_does_not_add_MIME_Version(self):
m = self._str_msg('')
cm = self._TestContentManager()
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2026-10-20-04-00-00.gh-issue-120946.G8vD4r.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add the required ``MIME-Version`` header when converting an
:class:`email.message.EmailMessage` to a multipart message.
Loading
Back | FazBrowse Home | New Git URL