From 6ca8e6cd10bf0777ca7291e7c10a950e03da5d66 Mon Sep 17 00:00:00 2001 From: stefan Date: Tue, 14 Jul 2009 18:21:06 +0000 Subject: [PATCH] Fix issue2550565. git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4318 57a73879-2fb5-44c3-a270-3262357dd7e2 --- roundup/mailer.py | 5 ++--- roundup/roundupdb.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/roundup/mailer.py b/roundup/mailer.py index 0d801bc..4ab9b13 100644 --- a/roundup/mailer.py +++ b/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 @@ class Mailer: 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 @@ class Mailer: # 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 diff --git a/roundup/roundupdb.py b/roundup/roundupdb.py index fe9c8e3..1a9f705 100644 --- a/roundup/roundupdb.py +++ b/roundup/roundupdb.py @@ -16,7 +16,6 @@ from __future__ import nested_scopes # 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 @@ class IssueClass: 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): -- 2.30.2