From fa7a5baca6e977770864fc1e3eac732ea2af0749 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 26 Jan 2010 15:46:47 +0100 Subject: [PATCH] [imp] don't include MIMEText call in encoding-related branches bzr revid: xmo@tinyerp.com-20100126144647-gxd1eqmu3duh8ys9 --- bin/tools/misc.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/bin/tools/misc.py b/bin/tools/misc.py index c8ebe3a9885..7b9777a694f 100644 --- a/bin/tools/misc.py +++ b/bin/tools/misc.py @@ -426,16 +426,14 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non if not email_cc: email_cc = [] if not email_bcc: email_bcc = [] if not body: body = u'' - try: - email_text = MIMEText(body.encode('utf-8'),_subtype=subtype, - _charset='utf-8') + try: email_body = body.encode('utf-8') except (UnicodeEncodeError, UnicodeDecodeError): - email_text = MIMEText(body,_subtype=subtype,_charset='utf-8') + email_body = body - if attach: - msg = MIMEMultipart() - else: - msg = email_text + email_text = MIMEText(mail_body, _subtype=subtype, _charset='utf-8') + + if attach: msg = MIMEMultipart() + else: msg = email_text msg['Subject'] = Header(ustr(subject), 'utf-8') msg['From'] = email_from