From ea803b42cbc060a8f60293f3181e5cf1d4e97ac3 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 11 Jun 2019 16:41:31 +0200 Subject: [PATCH] sendmail revisited for python3 because recipient addresses were erroneously converted to bytes --- PLC/sendmail.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/PLC/sendmail.py b/PLC/sendmail.py index 16fcef2..a1f2f3e 100644 --- a/PLC/sendmail.py +++ b/PLC/sendmail.py @@ -32,7 +32,7 @@ def sendmail(api, To, Subject, Body, From = None, Cc = None, Bcc = None): api.config.PLC_MAIL_SUPPORT_ADDRESS) # Create a MIME-encoded UTF-8 message - msg = MIMEText(Body.encode(api.encoding), _charset = api.encoding) + msg = MIMEText(Body) # Unicode subject headers are automatically encoded correctly msg['Subject'] = Subject @@ -57,12 +57,8 @@ def sendmail(api, To, Subject, Body, From = None, Cc = None, Bcc = None): for addr in addresses: if isinstance(addr, tuple): (name, addr) = addr - try: - name = name.encode('ascii') - header.append('%s <%s>' % (name, addr)) - except: - h = Header(name, charset = api.encoding, header_name = header_name) - header.append('"%s" <%s>' % (h.encode(), addr)) + h = Header(name, charset = api.encoding, header_name = header_name) + header.append('"%s" <%s>' % (h, addr)) else: header.append(addr) addrs.append(addr) -- 2.43.0