diff options
| author | Antoine Fontaine <antoine.fontaine@gmail.com> | 2016-08-09 00:29:55 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-08-08 20:13:29 -0400 |
| commit | 004ba05bcaab9133bc2b7f943f6c3198da38dbc0 (patch) | |
| tree | 86bff7df9b8412def0df0b626b06790fd3de7797 | |
| parent | 35225e2ade08ea32e36a994cd4ff90842c599e20 (diff) | |
Fixed #27036 -- Made locmem email backend's send_messages() accept generators.
| -rw-r--r-- | django/core/mail/backends/locmem.py | 2 | ||||
| -rw-r--r-- | tests/mail/tests.py | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/django/core/mail/backends/locmem.py b/django/core/mail/backends/locmem.py index 92f55f74c2..54d3847c03 100644 --- a/django/core/mail/backends/locmem.py +++ b/django/core/mail/backends/locmem.py @@ -24,6 +24,6 @@ class EmailBackend(BaseEmailBackend): msg_count = 0 for message in messages: # .message() triggers header validation message.message() + mail.outbox.append(message) msg_count += 1 - mail.outbox.extend(messages) return msg_count diff --git a/tests/mail/tests.py b/tests/mail/tests.py index c48a7c65b6..0f0eb5bdf1 100644 --- a/tests/mail/tests.py +++ b/tests/mail/tests.py @@ -748,12 +748,16 @@ class BaseEmailBackendTests(HeadersCheckMixin, object): def test_send_many(self): email1 = EmailMessage('Subject', 'Content1', 'from@example.com', ['to@example.com']) email2 = EmailMessage('Subject', 'Content2', 'from@example.com', ['to@example.com']) - num_sent = mail.get_connection().send_messages([email1, email2]) - self.assertEqual(num_sent, 2) - messages = self.get_mailbox_content() - self.assertEqual(len(messages), 2) - self.assertEqual(messages[0].get_payload(), "Content1") - self.assertEqual(messages[1].get_payload(), "Content2") + # send_messages() may take a list or a generator. + emails_lists = ([email1, email2], (email for email in [email1, email2])) + for emails_list in emails_lists: + num_sent = mail.get_connection().send_messages(emails_list) + self.assertEqual(num_sent, 2) + messages = self.get_mailbox_content() + self.assertEqual(len(messages), 2) + self.assertEqual(messages[0].get_payload(), 'Content1') + self.assertEqual(messages[1].get_payload(), 'Content2') + self.flush_mailbox() def test_send_verbose_name(self): email = EmailMessage("Subject", "Content", '"Firstname Sürname" <from@example.com>', |