1.1 --- a/imiptools/__init__.py Sat Oct 25 17:53:34 2014 +0200
1.2 +++ b/imiptools/__init__.py Sat Oct 25 18:46:01 2014 +0200
1.3 @@ -1,6 +1,7 @@
1.4 #!/usr/bin/env python
1.5
1.6 from email import message_from_file
1.7 +from email.mime.message import MIMEMessage
1.8 from email.mime.multipart import MIMEMultipart
1.9 from email.mime.text import MIMEText
1.10 from smtplib import LMTP, SMTP
1.11 @@ -103,12 +104,12 @@
1.12 # Forward messages to their recipients using the existing message.
1.13
1.14 if forwarded_parts:
1.15 - msg.get_payload()[:0] = forwarded_parts
1.16 + message = self.wrap_message(msg, forwarded_parts)
1.17
1.18 if "-d" in sys.argv:
1.19 - print msg
1.20 + print message
1.21 elif self.lmtp_socket:
1.22 - sendmail(self.sender, original_recipients, msg.as_string(), self.lmtp_socket)
1.23 + sendmail(self.sender, original_recipients, message.as_string(), self.lmtp_socket)
1.24
1.25 # Unhandled messages are delivered as they are.
1.26
1.27 @@ -134,6 +135,20 @@
1.28
1.29 return message
1.30
1.31 + def wrap_message(self, msg, parts):
1.32 +
1.33 + "Wrap 'msg' and provide the given 'parts' as the primary content."
1.34 +
1.35 + message = MIMEMultipart("mixed", _subparts=parts)
1.36 + message.preamble = self.body_text
1.37 + message.get_payload().append(MIMEMessage(msg))
1.38 +
1.39 + message["From"] = msg["From"]
1.40 + message["To"] = msg["To"]
1.41 + message["Subject"] = msg["Subject"]
1.42 +
1.43 + return message
1.44 +
1.45 def process_args(self, args, stream):
1.46
1.47 """