Changeset 745 for trunk/trac-hacks/announcerplugin/announcerplugin/distributors/email_distributor.py

Timestamp:

12/02/08 15:22:15 (4 years ago)

Author:

rcorsaro

Message:

merged latest announcer trac-hacks commits

File:

• trunk/trac-hacks/announcerplugin/announcerplugin/distributors/email_distributor.py (modified) (7 diffs)

trunk/trac-hacks/announcerplugin/announcerplugin/distributors/email_distributor.py

@@ -3 +3 @@
 from trac.config import Option, BoolOption, IntOption, OrderedExtensionsOption
 from trac.util import get_pkginfo
+from trac.util.translation import _
+
 from announcerplugin.api import IAnnouncementDistributor
 from announcerplugin.api import IAnnouncementFormatter
@@ -13 +15 @@
 from email.MIMEText import MIMEText
 from email.Utils import formatdate
-from email.header import Header
+try:
+    from email.header import Header
+except:
+    from email.Header import Header
 import time, Queue, threading, smtplib
 
@@ -119 +124 @@
     
     default_email_format = Option('announcer', 'default_email_format', 'text/plain')
-    
+
     def __init__(self):
-        if self.smtp_enabled and self.use_threaded_delivery:
-            self._deliveryQueue = Queue.Queue()
-            thread = DeliveryThread(self._deliveryQueue, self._transmit)
+        self.delivery_queue = None
+
+    def get_delivery_queue(self):
+        if not self.delivery_queue:
+            self.delivery_queue = Queue.Queue()
+            thread = DeliveryThread(self.delivery_queue, self._transmit)
             thread.start()
+
+        return self.delivery_queue
     
     # IAnnouncementDistributor
@@ -133 +143 @@
         if not self.smtp_enabled:
             return
-        
         public_cc = self.config.getbool('announcer', 'use_public_cc')
         to = self.config.get('announcer', 'smtp_to')
@@ -228 +237 @@
         subject = formatter.format_subject(transport, event.realm, format, event)
         
-        charset = self.env.config.get('trac', 'default_charset') or 'utf-8'
+        charset = self.env.config.get('trac', 'default_charset', 'utf-8')
         alternate_format = formatter.get_format_alternative(transport, event.realm, format)
         if alternate_format:
@@ -277 +286 @@
         package = (self.smtp_from, [x[2] for x in recipients if x], rootMessage.as_string() )
         if self.use_threaded_delivery:
-            self._deliveryQueue.put(package)
+            self.get_delivery_queue().put(package)
         else:
             self._transmit(*package)
@@ -285 +294 @@
 
     def _transmit(self, smtpfrom, addresses, message):
-        smtp = smtplib.SMTP()
-        smtp.connect(self.smtp_server)
+        smtp = smtplib.SMTP(self.smtp_server, self.smtp_port)
         if self.use_tls:
             smtp.ehlo()
+            if not smtp.esmtp_features.has_key('starttls'):
+                raise TracError(_("TLS enabled but server does not support " \
+                        "TLS"))
             smtp.starttls()
             smtp.ehlo()