From f3423cc3b74b96fa4094dfb0fa5fd1b704367845 Mon Sep 17 00:00:00 2001 From: Dan Jacob Date: Wed, 2 Feb 2011 13:50:45 +0000 Subject: [PATCH] add attachments directly --- pyramid_mailer/message.py | 15 ++------------- pyramid_mailer/tests.py | 5 +++-- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pyramid_mailer/message.py b/pyramid_mailer/message.py index f1e7aaa..daa5d64 100644 --- a/pyramid_mailer/message.py +++ b/pyramid_mailer/message.py @@ -163,23 +163,12 @@ def add_bcc(self, recipient): self.bcc.append(recipient) - def attach(self, - filename=None, - content_type=None, - data=None, - disposition=None): + def attach(self, attachment): """ - Adds an attachment to the message. - - :param filename: filename of attachment - :param content_type: file mimetype - :param data: the raw file data - :param disposition: content-disposition (if any) + Adds an IAttachment instance to the message. """ - attachment = Attachment(filename, content_type, data, disposition) - self.attachments.append(attachment) diff --git a/pyramid_mailer/tests.py b/pyramid_mailer/tests.py index e667937..45ffd25 100644 --- a/pyramid_mailer/tests.py +++ b/pyramid_mailer/tests.py @@ -128,13 +128,14 @@ def test_cc(self): def test_attach(self): from pyramid_mailer.message import Message + from pyramid_mailer.message import Attachment msg = Message(subject="testing", recipients=["to@example.com"], body="testing") - msg.attach(data="this is a test", - content_type="text/plain") + msg.attach(Attachment(data="this is a test", + content_type="text/plain")) a = msg.attachments[0]