Merge branch 'master' of github.com:webnotes/wnframework into handlerupdate

This commit is contained in:
Rushabh Mehta 2012-03-06 12:40:26 +01:00
commit facecf2a1e

View file

@ -61,8 +61,8 @@ class EMail:
Attach message in the text portion of multipart/alternative
"""
from email.mime.text import MIMEText
if type(message) is not unicode:
message = unicode(message, 'utf-8')
#if type(message) is not unicode:
# message = unicode(message, 'utf-8')
part = MIMEText(message.encode('utf-8'), 'plain', 'UTF-8')
self.msg_multipart.attach(part)
@ -71,8 +71,8 @@ class EMail:
Attach message in the html portion of multipart/alternative
"""
from email.mime.text import MIMEText
if type(message) is not unicode:
message = unicode(message, 'utf-8')
#if type(message) is not unicode:
# message = unicode(message, 'utf-8')
part = MIMEText(message.encode('utf-8'), 'html')
self.msg_multipart.attach(part)