X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2Fsendmail.py;h=a1f2f3eec82e4c0a2998adef9fa2da0671155502;hb=cbf8b264347629f692c36e22bbf35b00c609db1c;hp=cab0ae62dccd8b6e73194aac5aae409fcf8c3d88;hpb=e25d1555c7f4854e71f3082da697eb0b0f3c7733;p=plcapi.git

diff --git a/PLC/sendmail.py b/PLC/sendmail.py
index cab0ae6..a1f2f3e 100644
--- a/PLC/sendmail.py
+++ b/PLC/sendmail.py
@@ -1,12 +1,11 @@
 import os
 import sys
 import pprint
-from types import StringTypes
-from email.MIMEText import MIMEText
-from email.Header import Header
+from email.mime.text import MIMEText
+from email.header import Header
 from smtplib import SMTP
 
-from PLC.Debug import log
+from PLC.Logger import logger
 from PLC.Faults import *
 
 def sendmail(api, To, Subject, Body, From = None, Cc = None, Bcc = None):
@@ -33,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
@@ -58,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)
@@ -86,7 +81,8 @@ def sendmail(api, To, Subject, Body, From = None, Cc = None, Bcc = None):
     msg['X-Mailer'] = "Python/" + sys.version.split(" ")[0]
 
     if not api.config.PLC_MAIL_ENABLED:
-        print >> log, "From: %(From)s, To: %(To)s, Subject: %(Subject)s" % msg
+        logger.info("PLC_MAIL_ENABLED not set")
+        logger.info("From: %(From)s, To: %(To)s, Subject: %(Subject)s" % msg)
         return
 
     s = SMTP()
@@ -95,4 +91,4 @@ def sendmail(api, To, Subject, Body, From = None, Cc = None, Bcc = None):
     s.close()
 
     if rejected:
-        raise PLCAPIError, "Error sending message to " + ", ".join(rejected.keys())
+        raise PLCAPIError("Error sending message to " + ", ".join(list(rejected.keys())))