odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[imp] don't include MIMEText call in encoding-related branches 

bzr revid: xmo@tinyerp.com-20100126144647-gxd1eqmu3duh8ys9
This commit is contained in:
Xavier Morel 2010-01-26 15:46:47 +01:00
parent f98f5e2192
commit fa7a5baca6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/tools/misc.py
View File

@ -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