# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1414532380 -3600
# Node ID e9183115c2581f816ed70450d18b69c7df8c28a7
# Parent  605d701ed26261eda16606d5cf3439e3740a679a
Tidied up message preparation, adding separate preamble text.

diff -r 605d701ed262 -r e9183115c258 imiptools/mail.py
--- a/imiptools/mail.py	Tue Oct 28 18:22:28 2014 +0100
+++ b/imiptools/mail.py	Tue Oct 28 22:39:40 2014 +0100
@@ -13,14 +13,20 @@
 This is a response to a calendar message sent by your calendar program.
 """
 
+PREAMBLE_TEXT = """\
+This message contains several different parts, one of which will contain
+calendar information that will only be understood by a suitable program.
+"""
+
 class Messenger:
 
     "Sending of outgoing messages."
 
-    def __init__(self, sender=None, subject=None, body_text=None):
+    def __init__(self, sender=None, subject=None, body_text=None, preamble_text=None):
         self.sender = sender or MESSAGE_SENDER
         self.subject = subject or MESSAGE_SUBJECT
         self.body_text = body_text or MESSAGE_TEXT
+        self.preamble_text = preamble_text or PREAMBLE_TEXT
 
     def sendmail(self, recipients, data, sender=None, lmtp_socket=None):
 
@@ -46,7 +52,7 @@
         """
 
         message = MIMEMultipart("mixed", _subparts=parts)
-        message.preamble = self.body_text
+        message.preamble = self.preamble_text
         payload = message.get_payload()
         payload.insert(0, MIMEText(self.body_text))
 
@@ -62,8 +68,10 @@
         "Wrap 'msg' and provide the given 'parts' as the primary content."
 
         message = MIMEMultipart("mixed", _subparts=parts)
-        message.preamble = self.body_text
-        message.get_payload().append(MIMEMessage(msg))
+        message.preamble = self.preamble_text
+        payload = message.get_payload()
+        payload.insert(0, MIMEText(self.body_text))
+        payload.append(MIMEMessage(msg))
 
         message["From"] = msg["From"]
         message["To"] = msg["To"]