dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
mdipierro
2013-08-24 05:18:52 -05:00
parent 07aa9843f3 ae2d800b0b
commit 80279a8d8d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+2 -2
View File
@@ -429,13 +429,13 @@ class Mail(object):
html = html.decode(encoding).encode('utf-8') html = html.decode(encoding).encode('utf-8')
# Construct mime part only if needed # Construct mime part only if needed
if text and html: if text is not None and html:
# We have text and html we need multipart/alternative # We have text and html we need multipart/alternative
attachment = MIMEMultipart.MIMEMultipart('alternative') attachment = MIMEMultipart.MIMEMultipart('alternative')
attachment.attach(MIMEText.MIMEText(text, _charset='utf-8')) attachment.attach(MIMEText.MIMEText(text, _charset='utf-8'))
attachment.attach( attachment.attach(
MIMEText.MIMEText(html, 'html', _charset='utf-8')) MIMEText.MIMEText(html, 'html', _charset='utf-8'))
elif text: elif text is not None:
attachment = MIMEText.MIMEText(text, _charset='utf-8') attachment = MIMEText.MIMEText(text, _charset='utf-8')
elif html: elif html:
attachment = \ attachment = \