Changeset 85

Timestamp:

02/27/08 14:50:45 (9 months ago)

Author:

fs

Message:

Cleanup: Don't import turbomail.control.interface as turbomail

Location:

trunk/turbomail

Files:

• managers/demand.py (modified) (3 diffs)
• message.py (modified) (5 diffs)
• providers/smtp.py (modified) (3 diffs)

trunk/turbomail/managers/demand.py

@@ -11 +11 @@
 from turbomail.api import Manager
 from turbomail.exceptions import ProviderExhaustedException
-from turbomail.control import interface as turbomail
+from turbomail.control import interface
 
 import math, copy
@@ -38 +38 @@
         self.finished = Event()
         
-        self.threads = turbomail.config.get("mail.demand.threads", 4) # Maximum number of threads to create.
-        self.divisor = turbomail.config.get("mail.demand.divisor", 10) # Estimate the number of required threads by dividing the queue size by this.
-        self.timeout = turbomail.config.get("mail.demand.timeout", 60)
+        self.threads = interface.config.get("mail.demand.threads", 4) # Maximum number of threads to create.
+        self.divisor = interface.config.get("mail.demand.divisor", 10) # Estimate the number of required threads by dividing the queue size by this.
+        self.timeout = interface.config.get("mail.demand.timeout", 60)
         
         log.info("Demand manager ready.")
@@ -86 +86 @@
     def worker(self):
         log.debug("Requesting new provider instance from.")
-        provider = turbomail.provider.new()
+        provider = interface.provider.new()
         if not provider: raise ManagerException, "Unable to allocate new provider."
         

trunk/turbomail/message.py

@@ -7 +7 @@
 from turbomail import release
 from turbomail.util import AddressList
-from turbomail.control import interface as turbomail
+from turbomail.control import interface
 import re, os, email
 
@@ -63 +63 @@
         
         def configget(name, key, default=None):
-            return kw.get(name, turbomail.config.get(key, default))
+            return kw.get(name, interface.config.get(key, default))
         
         self.date = kw.get("date", formatdate(localtime=True))
@@ -166 +166 @@
         assert self.plain, "You must provide plain text content."
 
-        if not self._dirty and self._processed and not turbomail.config.get("mail.debug", False):
+        if not self._dirty and self._processed and not interface.config.get("mail.debug", False):
             return self._mime
         
@@ -192 +192 @@
             ]
         
-        if turbomail.config.get("mail.brand", True):
+        if interface.config.get("mail.brand", True):
             headers.extend([
                     ('X-Mailer', "%s <%s>" % (release.name, release.url)),
@@ -198 +198 @@
                 ])
             
-            if turbomail.config.get("mail.debug", False):
+            if interface.config.get("mail.debug", False):
                 headers.append(('X-TurboMail-Message-GUID', self.id))
             
-            if turbomail.provider:
+            if interface.provider:
                 headers.extend([
-                        ('X-TurboMail-Provider', "%s <%s>" % (turbomail.provider.name, turbomail.provider.url)),
-                        ('X-TurboMail-Provider-Version', turbomail.provider.version),
+                        ('X-TurboMail-Provider', "%s <%s>" % (interface.provider.name, interface.provider.url)),
+                        ('X-TurboMail-Provider-Version', interface.provider.version),
                     ])
             
-            if turbomail.manager:
+            if interface.manager:
                 headers.extend([
-                        ('X-TurboMail-Manager', "%s <%s>" % (turbomail.manager.name, turbomail.manager.url)),
-                        ('X-TurboMail-Manager-Version', turbomail.manager.version),
+                        ('X-TurboMail-Manager', "%s <%s>" % (interface.manager.name, interface.manager.url)),
+                        ('X-TurboMail-Manager-Version', interface.manager.version),
                     ])
         

trunk/turbomail/providers/smtp.py

@@ -11 +11 @@
 from turbomail.api import ProviderFactory, Provider
 from turbomail.exceptions import MailConfigurationError, ProviderExhaustedException
-from turbomail.control import interface as turbomail
+from turbomail.control import interface
 
 from smtplib import SMTP, SMTPRecipientsRefused, SMTPSenderRefused, SMTPServerDisconnected
@@ -27 +27 @@
         log.debug("Being created.")
         
-        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.
+        self.server = interface.config.get("mail.smtp.server", "localhost")
+        self.user = interface.config.get("mail.smtp.user", None)
+        self.password = interface.config.get("mail.smtp.password", None)
+        self.tls = interface.config.get("mail.smtp.tls", None)
+        self.debug = interface.config.get("mail.smtp.debug", False)
+        self.count = interface.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."
@@ -99 +99 @@
                 deliverylog.warning("%s DEFERRED %s" % (message.id, e.__class__.__name__))
                 message.tries -= 1
-                turbomail.manager.deliver(message)
+                interface.manager.deliver(message)
                 return
             else: