Changeset 72

Timestamp:

11/09/07 05:31:49 (1 year ago)

Author:

amcgregor

Message:

Fixes to get 3.0 working again. Now in use on GothCandy? for comment notification. It's in Flux, yo\!

Location:

branches/3.0/turbomail

Files:

• control.py (modified) (1 diff)
• managers/demand.py (modified) (2 diffs)
• message.py (modified) (1 diff)
• providers/smtp.py (modified) (3 diffs)
• util.py (modified) (1 diff)

branches/3.0/turbomail/control.py

@@ -63 +63 @@
                                 self.stop(force=True)
                                 return
-                        setattr(self, t, controller.load())
-                        controller.start()
+                        setattr(self, t, controller)
+                        if hasattr(getattr(self, t), 'load'):
+                                setattr(self, t, getattr(self, t).load())
+                        if hasattr(getattr(self, t), 'start'):
+                                getattr(self, t).start()
                 
                 # Load the requested manager and provider.

branches/3.0/turbomail/managers/demand.py

@@ -8 +8 @@
 log = logging.getLogger("turbomail.manager")
 
-import turbomail
+from turbomail.exceptions import *
 from turbomail.api import Manager
 from turbomail.exceptions import ProviderExhaustedException
+from turbomail.control import interface as turbomail
 
 import math, copy
 from Queue import Queue, Empty
 from threading import Event, Thread
-from turbomail.dispatch import Dispatch
 
 __all__ = ['load']
@@ -85 +85 @@
         
         def worker(self):
-                log.debug("Requesting new provider instance.")
+                log.debug("Requesting new provider instance from.")
                 provider = turbomail.provider.new()
                 if not provider: raise ManagerException, "Unable to allocate new provider."

branches/3.0/turbomail/message.py

@@ -5 +5 @@
 __version__ = "$Revision$"
 
-import turbomail
 from turbomail import release
 from turbomail.util import AddressList
+from turbomail.control import interface as turbomail
 import re, os, email
 

branches/3.0/turbomail/providers/smtp.py

@@ -9 +9 @@
 deliverylog = logging.getLogger("turbomail.delivery")
 
-import turbomail
-from turbomail import config
 from turbomail.api import ProviderFactory, Provider
 from turbomail.exceptions import MailConfigurationError, ProviderExhaustedException
+from turbomail.control import interface as turbomail
 
-from smtplib import SMTP, SMTPRecipientsRefused, SMTPSenderRefused
+from smtplib import SMTP, SMTPRecipientsRefused, SMTPSenderRefused, SMTPServerDisconnected
 
 __all__ = ['load']
@@ -28 +27 @@
                 log.debug("Being created.")
                 
-                self.server = config.get("mail.smtp.server", "localhost")
-                self.user = config.get("mail.smtp.user", None)
-                self.password = config.get("mail.smtp.password", None)
-                self.tls = config.get("mail.smtp.tls", None)
-                self.debug = config.get("mail.smtp.debug", False)
-                self.count = config.get("mail.smtp.count", 10) # The number of messages per connection.
+                self.server = turbomail.config.get("mail.smtp.server", "localhost")
+                self.user = turbomail.config.get("mail.smtp.user", None)
+                self.password = turbomail.config.get("mail.smtp.password", None)
+                self.tls = turbomail.config.get("mail.smtp.tls", None)
+                self.debug = turbomail.config.get("mail.smtp.debug", False)
+                self.count = turbomail.config.get("mail.smtp.count", 10) # The number of messages per connection.
                 
                 # Defaults to localhost -- if self.server is None: raise MailConfigurationError, "You must define mail.smtp.server in your configuration."
@@ -95 +94 @@
                 
                 except Exception, e:
-                        deliverylog.debug("%s EXCEPTION %s %s" % (message.id, e.__class__.__name__, e.message), exc_info=True)
+                        deliverylog.debug("%s EXCEPTION %s" % (message.id, e.__class__.__name__), exc_info=True)
                         
                         if message.tries > 0:
-                                deliverylog.warning("%s DEFERRED %s %s" % (message.id, e.__class__.__name__, e.message))
+                                deliverylog.warning("%s DEFERRED %s" % (message.id, e.__class__.__name__))
                                 message.tries -= 1
                                 turbomail.manager.deliver(message)
                                 return
                         else:
-                                deliverylog.error("%s REFUSED %s %s" % (message.id, e.__class__.__name__, e.message), exc_info=True)
+                                deliverylog.error("%s REFUSED %s" % (message.id, e.__class__.__name__), exc_info=True)
                                 raise
                 

branches/3.0/turbomail/util.py

@@ -9 +9 @@
 from turbomail.exceptions import MailNotEnabledError
 from email.Header import Header
-from email.utils import parseaddr, formataddr
+from email.Utils import parseaddr, formataddr
 
 __all__ = ['Address', 'AddressList']