Changeset 7471

Timestamp:

14 Jan 2012, 12:45:17 (13 years ago)

Author:

uli

Message:

Replace old send_mail() with wrapper to new location.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

@@ -19 +19 @@
 """
 import grok
-import smtplib
 import string
 from random import SystemRandom as r
-from email.mime.text import MIMEText
 from waeup.sirp.interfaces import ISIRPUtils
-
-from email.Header import Header
-from email.Utils import parseaddr, formataddr
+from waeup.sirp.smtp import send_mail as send_mail_internally
 
 def send_mail(from_name,from_addr,rcpt_name,rcpt_addr,subject,body,config):
+    """Wrapper for the real SMTP functionality in :mod:`waeup.sirp.smtp`.
+
+    Merely here to stay compatible with lots of calls to this place.
     """
-    XXX: While this method is unicode-proof (i.e. it can handle
-         non-plain-ASCII chars in names and messages) other
-         methods inhere are not and will fail silently. Some
-         reorganization of SMPT-related code is needed here.
-    """
-
-    header_charset = 'ISO-8859-1'
-    from_name = str(Header(unicode(from_name), header_charset))
-    rcpt_name = str(Header(unicode(rcpt_name), header_charset))
-    from_addr = from_addr.encode('ascii')
-    rpct_addr = rcpt_addr.encode('ascii')
-    for body_charset in ['US-ASCII', 'ISO-8859-1', 'UTF-8']:
-        try:
-            body.encode(body_charset)
-        except UnicodeError:
-            #print "FAILED: ", body_charset, body
-            pass
-        else:
-            break
-    msg = MIMEText(body.encode(body_charset), 'plain', body_charset)
-    msg['From'] = formataddr((from_name, from_addr))
-    msg['To'] = formataddr((rcpt_name, rcpt_addr))
-    msg['Subject'] = Header(unicode(subject), header_charset)
-    server = smtplib.SMTP(config.smtp_server)
-    if config.smtp_requires_login:
-        server.login(config.smtp_username,config.smtp_password)
-    try:
-        server.sendmail(from_addr,rcpt_addr,msg.as_string())
-    except Exception, e:
-        # XXX: log error message
-        return False
-    server.quit()
+    mail_id = send_mail_internally(
+        from_name, from_addr, rcpt_name, rcpt_addr,
+        subject, body, config)
     return True
-
 
 class SIRPUtils(grok.GlobalUtility):