Merge 1b56660 into 329ccae

xsleonard · May 31, 2019 · 0831594 · 0831594
2 parents 329ccae + 1b56660
commit 0831594
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pystmark.py b/pystmark.py
@@ -276,6 +276,7 @@ class Message(object):
         'subject': 'Subject',
         'tag': 'Tag',
         'template_id': 'TemplateId',
+        'template_alias': 'TemplateAlias',
         'template_model': 'TemplateModel',
         'html': 'HtmlBody',
         'text': 'TextBody',
@@ -297,16 +298,17 @@ class Message(object):
     _default_content_type = 'application/octet-stream'
 
     def __init__(self, sender=None, to=None, cc=None, bcc=None, subject=None,
-                 template_id=None, template_model=None, tag=None, html=None,
-                 text=None, reply_to=None, headers=None, attachments=None,
-                 verify=False, track_opens=None):
+                 template_id=None, template_alias=None, template_model=None,
+                 tag=None, html=None, text=None, reply_to=None, headers=None,
+                 attachments=None, verify=False, track_opens=None):
         self.sender = sender
         self.to = to
         self.cc = cc
         self.bcc = bcc
         self.subject = subject
         self.tag = tag
         self.template_id = template_id
+        self.template_alias = template_alias
         self.template_model = template_model
         self.html = html
         self.text = text

diff --git a/tests/test_pystmark.py b/tests/test_pystmark.py
@@ -363,7 +363,7 @@ def test_load_message_native(self):
                    cc='dog,cat', bcc='foo,bar', subject='dogs',
                    track_opens=True, headers=[dict(Name='Food', Value='7')],
                    attachments=[], sender='admin', tag='tag',
-                   template_id='template_id', template_model='template_model')
+                   template_id='template_id', template_alias='template_alias', template_model='template_model')
         self.assertEqual(sorted(msg), sorted(Message._fields))
         self.assertNotRaises(TypeError, Message.load_message, msg)
         self.assertNotRaises(MessageError, Message.load_message, msg,