Changeset 401 for trunk/moap/util/mail.py

Timestamp:

24-06-09 11:38:18 (4 years ago)

Author:

thomas

Message:

• moap/test/test_util_mail.py:
• moap/util/mail.py: Migrate to using email because MimeWriter? is deprecated. Slightly change the test since the message gets encoded differently, with plain text being included as 7 bit text.

File:

• trunk/moap/util/mail.py (modified) (4 diffs)

trunk/moap/util/mail.py

@@ -1 @@
-# -*- Mode: Python -*-
+# -*- Mode: Python; test-case-name: moap.test.test_util_mail -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
@@ -6 +6 @@
 
 import smtplib
-import MimeWriter
-import base64
-import StringIO
+
+from email import encoders
+from email.mime import multipart, text, image, audio, base
 
 """
@@ -47 +47 @@
         Get the message.
         """
+        COMMASPACE = ', '
 
-        message = StringIO.StringIO()
-        writer = MimeWriter.MimeWriter(message)
-        writer.addheader('MIME-Version', '1.0')
-        writer.addheader('Subject', self.subject)
-        writer.addheader('To', ", ".join(self.to))
-
-        writer.startmultipartbody('mixed')
-
-        # start off with a text/plain part
-        part = writer.nextpart()
-        body = part.startbody('text/plain')
-        body.write(self.content)
+        # Create the container (outer) email message.
+        msg = multipart.MIMEMultipart()
+        msg['Subject'] = self.subject
+        msg['From'] = self.fromm
+        msg['To'] = COMMASPACE.join(self.to)
+        msg.preamble = self.content
 
         # add attachments
         for a in self.attachments:
-            part = writer.nextpart()
-            part.addheader('Content-Transfer-Encoding', 'base64')
-            body = part.startbody('%(mime)s; name=%(name)s' % a)
-            body.write(base64.encodestring(a['content']))
+            maintype, subtype = a['mime'].split('/', 1)
+            if maintype == 'text':
+                attach = text.MIMEText(a['content'], _subtype=subtype)
+            elif maintype == 'image':
+                attach = image.MIMEImage(a['content'], _subtype=subtype)
+            elif maintype == 'audio':
+                attach = audio.MIMEAudio(a['content'], _subtype=subtype)
+            else:
+                attach = base.MIMEBase(maintype, subtype)
+                attach.set_payload(a['content'])
+                # Encode the payload using Base64
+                encoders.encode_base64(msg)
+            # Set the filename parameter
+            attach.add_header(
+                'Content-Disposition', 'attachment', filename=a['name'])
+            msg.attach(attach)
+            
+        return msg.as_string()
 
-        # finish off
-        writer.lastpart()
-
-        return message.getvalue()
 
     def send(self, server="localhost"):
@@ -79 +84 @@
 
         return result
+
+