--- a/mail.py Fri Sep 18 14:50:44 2015 +0200
+++ b/mail.py Thu Sep 17 11:07:36 2015 +0200
@@ -86,7 +86,7 @@
to_addrs and cc_addrs are expected to be a list of email address without
name
"""
- assert type(content) is unicode, repr(content)
+ assert isinstance(content, text_type), repr(content)
msg = MIMEText(content.encode('UTF-8'), 'plain', 'UTF-8')
# safety: keep only the first newline
try:
@@ -97,13 +97,13 @@
if uinfo.get('email'):
email = uinfo['email']
elif config and config['sender-addr']:
- email = unicode(config['sender-addr'])
+ email = text_type(config['sender-addr'])
else:
email = u''
if uinfo.get('name'):
name = uinfo['name']
elif config and config['sender-name']:
- name = unicode(config['sender-name'])
+ name = text_type(config['sender-name'])
else:
name = u''
msg['From'] = addrheader(email, name)