From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 11 Jun 2019 14:41:31 +0000 (+0200)
Subject: sendmail revisited for python3
X-Git-Tag: plcapi-7.1-0~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ea803b42cbc060a8f60293f3181e5cf1d4e97ac3;p=plcapi.git

sendmail revisited for python3
because recipient addresses were erroneously converted to bytes
---

diff --git a/PLC/sendmail.py b/PLC/sendmail.py
index 16fcef24..a1f2f3ee 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)