Ticket #2503: announcerplugin-internationalized-chars-and-enable-tls.diff

./distributors/email_distributor.py

@@ -12 +12 @@
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEText import MIMEText
-from email.Utils import formatdate
+from email.header import Header
-import time, Queue, threading, smtplib
-
-class DeliveryThread(threading.Thread):
@@ -223 +224 @@
-        output = formatter.format(transport, event.realm, format, event)
-        subject = formatter.format_subject(transport, event.realm, format, event)
-        
+        charset = self.env.config.get('trac', 'default_charset') or 'utf-8'
-        alternate_format = formatter.get_format_alternative(transport, event.realm, format)
-        if alternate_format:
-            alternate_output = formatter.format(transport, event.realm, alternate_format, event)
@@ -245 +247 @@
-            rootMessage['X-Announcement-%s' % key.capitalize()] = str(provided_headers[key])
-        
-        rootMessage['Date'] = formatdate()
-subject
+Header(subject, charset) 
-        rootMessage['From'] = self.smtp_from
-        if to:
-            rootMessage['To'] = '"%s"'%(to)
@@ -261 +263 @@
-            parentMessage = rootMessage
-        
-        if alternate_output:
-
+, charset
-            parentMessage.attach(msgText)
-        
-
+, charset
-        parentMessage.attach(msgText)
-        
-        start = time.time()
@@ -281 +283 @@
-    def _transmit(self, smtpfrom, addresses, message):
-        smtp = smtplib.SMTP()
-        smtp.connect(self.smtp_server)
+        if self.use_tls:
+            smtp.ehlo()
+            smtp.starttls()
-        if self.smtp_user:
-            smtp.login(self.smtp_user, self.smtp_password)
-        smtp.sendmail(smtpfrom, addresses, message)