From 2652e90e20c859fe0d707a6939a57f2a227ca898 Mon Sep 17 00:00:00 2001 From: Kees van den Broek Date: Thu, 19 Jul 2018 21:33:13 +0200 Subject: [PATCH 1/2] fix: don't let bcc recipients end up in 'to'. --- flask_mailgun/api.py | 2 +- flask_mailgun/message.py | 4 ---- tests/test_send.py | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flask_mailgun/api.py b/flask_mailgun/api.py index 4731b7c..4da50fd 100644 --- a/flask_mailgun/api.py +++ b/flask_mailgun/api.py @@ -37,7 +37,7 @@ def send(self, message, envelope_from=None): :param envelope_from: Email address to be used in MAIL FROM command. """ mesage_data = {'from': envelope_from or message.sender, - 'to': message.send_to, + 'to': message.recipients, 'subject': message.subject, "cc": message.cc, "bcc": message.bcc, diff --git a/flask_mailgun/message.py b/flask_mailgun/message.py index 06141a7..3b87684 100644 --- a/flask_mailgun/message.py +++ b/flask_mailgun/message.py @@ -70,10 +70,6 @@ def __init__(self, subject='', self.rcpt_options = rcpt_options or [] self.attachments = attachments or [] - @property - def send_to(self): - return set(self.recipients) | set(self.bcc or ()) | set(self.cc or ()) - @property def html(self): return self.alts.get('html') diff --git a/tests/test_send.py b/tests/test_send.py index 149133b..9a32ae9 100644 --- a/tests/test_send.py +++ b/tests/test_send.py @@ -15,6 +15,7 @@ def test_send_simple_message(self): message = Message(subject="Hello", sender="from@example.com", recipients=["u1@example.com", "u2@example.com"], + bcc=["foo@bar.com"], body="Testing some Mailgun awesomness!") self.mailgun.send(message) self.assertTrue(self.mock_post.called) @@ -27,6 +28,8 @@ def test_send_simple_message(self): # self.assertEqual(files, []) self.assertEqual(data['from'], message.sender) self.assertEqual(data['to'], set(message.recipients)) + self.assertEqual(data['bcc'], set(message.bcc)) + self.assertEqual(data['cc'], set()) self.assertEqual(data['subject'], message.subject) self.assertEqual(data['text'], message.body) From d8b92dad01aef40e90c7d098eb3ac9ad515fb6ca Mon Sep 17 00:00:00 2001 From: Kees van den Broek Date: Thu, 16 Aug 2018 10:35:28 +0200 Subject: [PATCH 2/2] fix: update tests --- tests/test_send.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_send.py b/tests/test_send.py index 9a32ae9..10e34fa 100644 --- a/tests/test_send.py +++ b/tests/test_send.py @@ -27,9 +27,9 @@ def test_send_simple_message(self): self.assertEqual(auth, ('api', b'testtesttest')) # self.assertEqual(files, []) self.assertEqual(data['from'], message.sender) - self.assertEqual(data['to'], set(message.recipients)) - self.assertEqual(data['bcc'], set(message.bcc)) - self.assertEqual(data['cc'], set()) + self.assertEqual(data['to'], message.recipients) + self.assertEqual(data['bcc'], message.bcc) + self.assertEqual(data['cc'], []) self.assertEqual(data['subject'], message.subject) self.assertEqual(data['text'], message.body)