From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 4 Nov 2009 21:41:40 +0000 (-0000)
Subject: Bug #291331 - Make send_mail() encode the unicode message as bytes before
X-Git-Tag: v2.2_rc49~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d21b18670218f1932c7b68b0a64f9b2f4ab94ff;p=portage.git

Bug #291331 - Make send_mail() encode the unicode message as bytes before
passing it to smtplib.SMTP.sendmail(), in order to avoid a UnicodeEncodeError
which SMTP.send() tries to encode the message a plain ascii.

svn path=/main/trunk/; revision=14776
---

diff --git a/pym/portage/mail.py b/pym/portage/mail.py
index 040cd1136..9a69f9604 100644
--- a/pym/portage/mail.py
+++ b/pym/portage/mail.py
@@ -127,7 +127,9 @@ def send_mail(mysettings, message):
 				myconn = smtplib.SMTP(mymailhost, mymailport)
 			if mymailuser != "" and mymailpasswd != "":
 				myconn.login(mymailuser, mymailpasswd)
-			myconn.sendmail(myfrom, myrecipient, message.as_string())
+			msg = _unicode_encode(message.as_string(),
+				encoding=_encodings['content'], errors='backslashreplace')
+			myconn.sendmail(myfrom, myrecipient, msg)
 			myconn.quit()
 		except smtplib.SMTPException as e:
 			raise portage.exception.PortageException(_("!!! An error occured while trying to send logmail:\n")+str(e))