Skip to content

Commit

Permalink
Merge pull request #82 from SparkPost/ISSUE-78
Browse files Browse the repository at this point in the history
Update docs and example to show various from_email formats
  • Loading branch information
richleland committed Mar 9, 2016
2 parents 0d935e8 + 2c05450 commit 4cc4814
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion examples/transmissions/send_transmission.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
bcc=['blindcarboncopy@example.com'],
html='<p>Hello {{name}}</p>',
text='Hello {{name}}',
from_email='test@sparkpostbox.com',
from_email='Test User <test@sparkpostbox.com>',
subject='Example Script',
description='contrived example',
custom_headers={
Expand Down
7 changes: 5 additions & 2 deletions sparkpost/transmissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,11 @@ def send(self, **kwargs):
:param str html: HTML part of transmission
:param str text: Text part of transmission
:param str subject: Subject of transmission
:param str from_email: Friendly from of transmission, domain must be a
verified sending domain to your account or transmission will fail
:param str from_email: Email that the transmission comes from. The
domain must be a verified sending domain to your account or
the transmission will fail. You can pass a from email or both
from name and from email - `testing@example.com` or
`Test Email <testing@example.com>` will both work.
:param str reply_to: Reply to of transmission
:param str description: Description of transmission
:param str campaign: Campaign of transmission
Expand Down

0 comments on commit 4cc4814

Please sign in to comment.