Changeset 450

Timestamp:

09/11/08 16:25:25 (5 years ago)

Author:

dgynn

Message:

updating non-modified trac-hacks to  th:changeset:4267

Location:

trunk/trac-hacks/announcerplugin

Files:

• announcerplugin/api.py (modified) (3 diffs)
• announcerplugin/distributors/email_distributor.py (modified) (6 diffs)
• announcerplugin/subscribers/ticket_groups.py (modified) (2 diffs)
• announcerplugin/subscribers/watchers.py (modified) (6 diffs)
• setup.py (modified) (1 diff)

trunk/trac-hacks/announcerplugin/announcerplugin/api.py

@@ -2 +2 @@
 from trac.util.compat import set
 from trac.db import Table, Column, Index
+from trac.db import DatabaseManager
 from trac.env import IEnvironmentSetupParticipant
 import time
@@ -305 +306 @@
     def _upgrade_db(self, db):
         try:
-            from trac.db import DatabaseManager
             db_backend, _ = DatabaseManager(self.env)._get_connector()            
 
@@ -341 +341 @@
             for sp in self.subscribers:
                 categories = sp.get_subscription_categories(evt.realm)
-                if ('*' in categories) or (evt.category in categories):
-                    supported_subscribers.append(sp)
+                if categories:
+                    if ('*' in categories) or (evt.category in categories):
+                        supported_subscribers.append(sp)
             
             self.log.debug(

trunk/trac-hacks/announcerplugin/announcerplugin/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
 
@@ -206 +208 @@
                AND authenticated=%s
                AND name=%s
-        """, (sid, authenticated, 'announcer_email_format_%s' % realm))
+        """, (sid, int(authenticated), 'announcer_email_format_%s' % realm))
                 
         result = cursor.fetchone()
@@ -223 +225 @@
         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:
@@ -244 +247 @@
             rootMessage['X-Announcement-%s' % key.capitalize()] = str(provided_headers[key])
         
-        rootMessage['Subject'] = subject
+        rootMessage['Date'] = formatdate()
+        rootMessage['Subject'] = Header(subject, charset) 
         rootMessage['From'] = self.smtp_from
         if to:
@@ -260 +264 @@
         
         if alternate_output:
-            msgText = MIMEText(alternate_output, 'html' in alternate_format and 'html' or 'plain')
+            msgText = MIMEText(alternate_output, 'html' in alternate_format and 'html' or 'plain', charset)
             parentMessage.attach(msgText)
         
-        msgText = MIMEText(output, 'html' in format and 'html' or 'plain')
+        msgText = MIMEText(output, 'html' in format and 'html' or 'plain', charset)
         parentMessage.attach(msgText)
         
         start = time.time()
-
+        
         package = (self.smtp_from, [x[2] for x in recipients if x], rootMessage.as_string() )
         if self.use_threaded_delivery:
@@ -280 +284 @@
         smtp = smtplib.SMTP()
         smtp.connect(self.smtp_server)
+        if self.use_tls:
+            smtp.ehlo()
+            smtp.starttls()
+            smtp.ehlo()
         if self.smtp_user:
             smtp.login(self.smtp_user, self.smtp_password)

trunk/trac-hacks/announcerplugin/announcerplugin/subscribers/ticket_groups.py

@@ -21 +21 @@
     def get_subscription_categories(self, realm):
         if realm == "ticket":
-            yield 'changed'
-            yield 'created'
-            yield 'attachment added'
+            return('changed', 'created', 'attachment added')
+        else:
+            ()
     
     def get_subscriptions_for_event(self, event):
@@ -50 +50 @@
         cursor.execute("""
             SELECT sid, authenticated
-              FROM session_attribute
-               AND name=%s
+              FROM session_attribute 
+             WHERE name=%s
                AND value=%s
         """, ('announcer_joinable_group_' + group, "1"))

trunk/trac-hacks/announcerplugin/announcerplugin/subscribers/watchers.py

@@ -77 +77 @@
                AND category=%s
                AND rule=%s
-        """, (sid, authenticated and 1 or 0, 'watcher', realm, '*', resource))
+        """, (sid, int(authenticated), 'watcher', realm, '*', str(resource)))
         
         result = cursor.fetchone()
@@ -103 +103 @@
                          %s, %s)
         """, (
-                sid, authenticated, 
+                sid, int(authenticated), 
                 'watcher', realm, '*', 
                 resource, 'email'
@@ -127 +127 @@
                AND category=%s
                AND rule=%s
-        """, (sid, authenticated, 'watcher', realm, '*', resource))
+        """, (sid, int(authenticated), 'watcher', realm, '*', str(resource)))
         
         if not use_db:
@@ -198 +198 @@
                AND realm=%s
                AND rule=%s
-        """, ('watcher', 'wiki', page.name))
+        """, ('watcher', 'wiki', str(page.name)))
 
         db.commit()
@@ -224 +224 @@
                AND realm=%s
                AND rule=%s
-        """, ('watcher', 'ticket', ticket.id))
+        """, ('watcher', 'ticket', str(ticket.id)))
 
         db.commit()
@@ -249 +249 @@
                        AND category=%s
                        AND rule=%s
-                """, ('watcher', event.realm, '*', self._get_target_identifier(event.realm, event.target)))
+                """, ('watcher', event.realm, '*', 
+                    str(self._get_target_identifier(event.realm, 
+                    event.target))))
             
                 for transport, sid, authenticated in cursor.fetchall():

trunk/trac-hacks/announcerplugin/setup.py

@@ -28 +28 @@
 # ----------------------------------------------------------------------------
 
+# Maintained by doki_pen <doki_pen@doki-pen.org>
+
 from setuptools import find_packages, setup