From f329f7494d17dd5e53ea50a71cc9239c3f054ed7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 7 Nov 2009 01:10:13 +0000 Subject: 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. (trunk r14776) svn path=/main/branches/2.1.7/; revision=14789 --- pym/portage/mail.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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)) -- cgit v1.2.3-1-g7c22