Fix issue2550565.

Author: stefanseefeld

roundup/mailer.py

@@ -1,7 +1,6 @@
 """Sending Roundup-specific mail over SMTP.
 """
 __docformat__ = 'restructuredtext'
-# $Id: mailer.py,v 1.22 2008-07-21 01:44:58 richard Exp $
 
 import time, quopri, os, socket, smtplib, re, sys, traceback, email
 
@@ -117,7 +116,7 @@ def standard_message(self, to, subject, content, author=None):
         message = self.get_standard_message(to, subject, author)
         message.set_payload(content)
         encode_quopri(message)
-        self.smtp_send(to, str(message))
+        self.smtp_send(to, message.as_string())
 
     def bounce_message(self, bounced_message, to, error,
                        subject='Failed issue tracker submission'):
@@ -163,7 +162,7 @@ def bounce_message(self, bounced_message, to, error,
 
         # send
         try:
-            self.smtp_send(to, str(message))
+            self.smtp_send(to, message.as_string())
         except MessageSendError:
             # squash mail sending errors when bouncing mail
             # TODO this *could* be better, as we could notify admin of the

roundup/roundupdb.py

@@ -16,7 +16,6 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: roundupdb.py,v 1.139 2008-08-07 06:31:16 richard Exp $
 
 """Extending hyperdb with types specific to issue-tracking.
 """
@@ -499,9 +498,9 @@ def send_message(self, nodeid, msgid, note, sendto, from_address=None,
                 encode_quopri(message)
 
             if first:
-                mailer.smtp_send(sendto + bcc_sendto, str(message))
+                mailer.smtp_send(sendto + bcc_sendto, message.as_string())
             else:
-                mailer.smtp_send(sendto, str(message))
+                mailer.smtp_send(sendto, message.as_string())
             first = False
 
     def email_signature(self, nodeid, msgid):