mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #28912 -- Made EmailMessage.message() omit an empty To header.

Browse Source
This commit is contained in:
Jon Dufresne 2017-12-08 19:28:34 -08:00 committed by Tim Graham
parent b03d500295
commit da82939e5a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/mail/message.py
View File

@ -254,7 +254,7 @@ class EmailMessage:
msg = self._create_message(msg) msg = self._create_message(msg)
msg['Subject'] = self.subject msg['Subject'] = self.subject
msg['From'] = self.extra_headers.get('From', self.from_email) msg['From'] = self.extra_headers.get('From', self.from_email)
msg['To'] = self.extra_headers.get('To', ', '.join(map(str, self.to))) self._set_list_header_if_not_empty(msg, 'To', self.to)
self._set_list_header_if_not_empty(msg, 'Cc', self.cc) self._set_list_header_if_not_empty(msg, 'Cc', self.cc)
self._set_list_header_if_not_empty(msg, 'Reply-To', self.reply_to) self._set_list_header_if_not_empty(msg, 'Reply-To', self.reply_to)
@ -271,7 +271,7 @@ class EmailMessage:
# Use cached DNS_NAME for performance # Use cached DNS_NAME for performance
msg['Message-ID'] = make_msgid(domain=DNS_NAME) msg['Message-ID'] = make_msgid(domain=DNS_NAME)
for name, value in self.extra_headers.items(): for name, value in self.extra_headers.items():
if name.lower() in ('from', 'to'): # From and To are already handled if name.lower() == 'from': # From is already handled
continue continue
msg[name] = value msg[name] = value
return msg return msg

4
tests/mail/tests.py
View File

@ -85,6 +85,10 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
self.assertEqual(message['From'], 'from@example.com') self.assertEqual(message['From'], 'from@example.com')
self.assertEqual(message['To'], 'to@example.com, other@example.com') self.assertEqual(message['To'], 'to@example.com, other@example.com')
def test_header_omitted_for_no_to_recipients(self):
message = EmailMessage('Subject', 'Content', 'from@example.com', cc=['cc@example.com']).message()
self.assertNotIn('To', message)
def test_recipients_with_empty_strings(self): def test_recipients_with_empty_strings(self):
""" """
Empty strings in various recipient arguments are always stripped Empty strings in various recipient arguments are always stripped