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

encoding in mail.send, thanks Jonathan

Browse Source
This commit is contained in:
mdipierro
2013-03-28 14:59:06 -05:00
parent bf5fbd8b09
commit cd1ce28639
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.5-stable+timestamp.2013.03.28.14.45.53 Version 2.4.5-stable+timestamp.2013.03.28.14.58.27
gluon/tools.py
+8 -3
View File
@@ -374,10 +374,14 @@ class Mail(object):
payload_in = MIMEMultipart.MIMEMultipart('mixed') payload_in = MIMEMultipart.MIMEMultipart('mixed')
else: else:
# no encoding configuration for raw messages # no encoding configuration for raw messages
if isinstance(message, basestring): if not isinstance(message, basestring):
message = message.read()
if isinstance(message, unicode):
text = message.encode('utf-8')
elif not encoding=='utf-8':
text = message.decode(encoding).encode('utf-8') text = message.decode(encoding).encode('utf-8')
else: else:
text = message.read().decode(encoding).encode('utf-8') text = message
# No charset passed to avoid transport encoding # No charset passed to avoid transport encoding
# NOTE: some unicode encoded strings will produce # NOTE: some unicode encoded strings will produce
# unreadable mail contents. # unreadable mail contents.
@@ -397,7 +401,8 @@ class Mail(object):
text = html = None text = html = None
elif isinstance(message, (list, tuple)): elif isinstance(message, (list, tuple)):
text, html = message text, html = message
elif message.strip().startswith('<html') and message.strip().endswith('</html>'): elif message.strip().startswith('<html') and \
message.strip().endswith('</html>'):
text = self.settings.server == 'gae' and message or None text = self.settings.server == 'gae' and message or None
html = message html = message
else: else: