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

[imp] remove redundancies between sending mails with and without attachments 

bzr revid: xmo@tinyerp.com-20100126144154-xgk8ep9skczc1vf5
This commit is contained in:
Xavier Morel 2010-01-26 15:41:54 +01:00
parent e4de42a1b7
commit f98f5e2192
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/tools/misc.py
View File

@ -415,29 +415,27 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
if x_headers is None:
x_headers = {}
if not ssl:
ssl = config.get('smtp_ssl', False)
if not ssl: ssl = config.get('smtp_ssl', False)
if not (email_from or config['email_from']):
raise ValueError("Sending an email requires either providing a sender "
"address or having configured one")
if not email_from:
email_from = config.get('email_from', False)
if not email_from: email_from = config.get('email_from', False)
if not email_cc:
email_cc = []
if not email_bcc:
email_bcc = []
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')
except (UnicodeEncodeError, UnicodeDecodeError):
email_text = MIMEText(body,_subtype=subtype,_charset='utf-8')
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 = email_text
msg['Subject'] = Header(ustr(subject), 'utf-8')
msg['From'] = email_from
@ -468,10 +466,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
msg['Message-Id'] = "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
if attach:
try:
msg.attach(MIMEText(body.encode('utf8') or '',_subtype=subtype,_charset='utf-8'))
except:
msg.attach(MIMEText(body or '', _charset='utf-8', _subtype=subtype) )
msg.attach(email_text)
for (fname,fcontent) in attach:
part = MIMEBase('application', "octet-stream")
part.set_payload( fcontent )