-
Notifications
You must be signed in to change notification settings - Fork 714
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.
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
Allow creation of Mail from EmailMessage #631
Merged
thinkingserious
merged 3 commits into
sendgrid:v4
from
cmccandless:support-email.message.EmailMessage
Oct 30, 2018
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,13 @@ | |
import json | ||
import unittest | ||
|
||
try: | ||
from email.message import EmailMessage | ||
except ImportError: | ||
# Python2 | ||
from email import message | ||
EmailMessage = message.Message | ||
|
||
from sendgrid.helpers.mail import ( | ||
ASM, | ||
APIKeyIncludedException, | ||
|
@@ -557,3 +564,26 @@ def test_disable_tracking(self): | |
def test_directly_setting_substitutions(self): | ||
personalization = Personalization() | ||
personalization.substitutions = [{'a': 0}] | ||
|
||
def test_from_emailmessage(self): | ||
message = EmailMessage() | ||
body = 'message that is not urgent' | ||
try: | ||
message.set_content(body) | ||
except AttributeError: | ||
# Python2 | ||
message.set_payload(body) | ||
message.set_default_type('text/plain') | ||
message['Subject'] = 'URGENT TITLE' | ||
message['From'] = '[email protected]' | ||
message['To'] = '[email protected]' | ||
mail = Mail.from_EmailMessage(message) | ||
self.assertEqual(mail.subject, 'URGENT TITLE') | ||
self.assertEqual(mail.from_email.email, '[email protected]') | ||
self.assertEqual(len(mail.personalizations), 1) | ||
self.assertEqual(len(mail.personalizations[0].tos), 1) | ||
self.assertDictEqual(mail.personalizations[0].tos[0], {'email': '[email protected]'}) | ||
self.assertEqual(len(mail.contents), 1) | ||
content = mail.contents[0] | ||
self.assertEqual(content.type, 'text/plain') | ||
self.assertEqual(content.value, 'message that is not urgent') |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Python docs show that
assertEqual
will already useassertDictEqual
to compare dicts by default and that it isn't necessary to call it directly.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good to know! I'll make the correction.