add attachments directly

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)
 
 

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]