[Python-checkins] r70411 - tracker/roundup-src/roundup/mailer.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon Mar 16 01:18:02 2009
New Revision: 70411

Log:
Stop sending multiple content-type and content-transfer-encoding
headers.


Modified:
   tracker/roundup-src/roundup/mailer.py

Modified: tracker/roundup-src/roundup/mailer.py
==============================================================================
--- tracker/roundup-src/roundup/mailer.py	(original)
+++ tracker/roundup-src/roundup/mailer.py	Mon Mar 16 01:18:02 2009
@@ -23,6 +23,7 @@
     orig = msg.get_payload()
     encdata = quopri.encodestring(orig)
     msg.set_payload(encdata)
+    del msg['Content-Transfer-Encoding']
     msg['Content-Transfer-Encoding'] = 'quoted-printable'
 
 class Mailer:
@@ -70,8 +71,8 @@
             message = MIMEMultipart()
         else:
             message = Message()
+            message.set_type('text/plain')
             message.set_charset(charset)
-            message['Content-Type'] = 'text/plain; charset="%s"'%charset
 
         try:
             message['Subject'] = subject.encode('ascii')