pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[imp] invert attachment condition, preset body value, use more precise exception catching

Browse Source 
bzr revid: xmo@tinyerp.com-20100126143507-pnfw1yoor58pknaw
This commit is contained in:
Xavier Morel
2010-01-26 15:35:07 +01:00
parent 24a5330564
commit e4de42a1b7
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/tools/misc.py
+7 -6
View File
@@ -430,13 +430,14 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
if not email_bcc:
email_bcc = []
if not attach:
try:
msg = MIMEText(body.encode('utf8') or '',_subtype=subtype,_charset='utf-8')
except:
msg = MIMEText(body or '',_subtype=subtype,_charset='utf-8')
else:
if attach:
msg = MIMEMultipart()
else:
if not body: body = u''
try:
msg = MIMEText(body.encode('utf8'),_subtype=subtype,_charset='utf-8')
except UnicodeEncodeError:
msg = MIMEText(body,_subtype=subtype,_charset='utf-8')
msg['Subject'] = Header(ustr(subject), 'utf-8')
msg['From'] = email_from