Changeset 71 for branches/3.0/turbomail/control.py

Timestamp:

11/09/07 04:38:51 (1 year ago)

Author:

amcgregor

Message:

More large-scale updates to the 3.0 branch.

Files:

• branches/3.0/turbomail/control.py (modified) (7 diffs)

branches/3.0/turbomail/control.py

@@ -7 +7 @@
 in your own applications::
 
-  import turbomail
-  turbomail.interface.start()
+  from turbomail.message import Message
+  from turbomail.control import interface
+  interface.start()
   
-  message = turbomail.Message(...)
-  turbomail.send(message)
+  message = Message(...)
+  interface.send(message)
   
-  turbomail.interface.stop()
+  interface.stop()
 
 TurboMail will, by default, immediately delete any messages remaining in
@@ -25 +26 @@
 log = logging.getLogger("turbomail.control")
 
-import turbomail
 import pkg_resources
 
@@ -40 +40 @@
                 self.running = False
                 self.extensions = dict()
+                self.config = dict()
+                self.manager = None
+                self.provider = None
                 
-                try:
-                        import turbogears
-                        
-                        turbogears.config.update(turbomail.config)
-                        turbomail.config = turbogears.config
-                        self.start_extension = self.start
-                        self.shutdown_extension = self.stop
-                
-                except ImportError:
-                        pass
-                
-                except AttributeError:
-                        pass
-        
-        def load_single_entry(self, group, name):
+        def __load_single_entry(self, group, name):
                 for entrypoint in pkg_resources.iter_entry_points(group, name):
                         return entrypoint.load()
@@ -61 +50 @@
         
         def start(self):
-                try:
-                        import turbogears
-                except ImportError:
-                        pass
-                else:
-                        turbomail.config = turbogears.config
-                
-                if not turbomail.config.get("mail.on", False):
+                if not self.config.get("mail.on", False):
                         return
                 
@@ -74 +56 @@
                 
                 def load(t, default):
-                        extension = turbomail.config.get("mail.%s" % t, default)
-                        controller = self.load_single_entry("turbomail.%ss" % t, extension)
+                        extension = self.config.get("mail.%s" % t, default)
+                        controller = self.__load_single_entry("turbomail.%ss" % t, extension)
                         if not controller:
-                                turbomail.config.update({"mail.on": False})
+                                self.config.update({"mail.on": False})
                                 log.error("Unable to locate %s %s, TurboMail disabled." % (extension, t))
                                 self.stop(force=True)
                                 return
-                        setattr(turbomail, t, controller.load())
+                        setattr(self, t, controller.load())
                         controller.start()
                 
@@ -92 +74 @@
                 for entrypoint in extensions:
                         log.debug("Found extension '%s'." % entrypoint.name)
-                        if turbomail.config.get("mail.%s.on" % entrypoint.name, False):
+                        
+                        if self.config.get("mail.%s.on" % entrypoint.name, False):
                                 log.info("Loading extension '%s'." % entrypoint.name)
+                                
                                 self.extensions[entrypoint.name] = entrypoint.load()
                                 
-                                if hasattr(self.extensions[entrypoint.name], 'load'):
+                                if hasattr(self.extensions[entrypoint.name], 'interface'):
+                                        self.extensions[entrypoint.name] = self.extensions[entrypoint.name].interface
+                                
+                                elif hasattr(self.extensions[entrypoint.name], 'load'):
                                         self.extensions[entrypoint.name] = self.extensions[entrypoint.name].load()
                                 
@@ -112 +99 @@
                 extensions = pkg_resources.iter_entry_points("turbomail.extensions")
                 for entrypoint in extensions:
-                        if turbomail.config.get("mail." + entrypoint.name + ".on", False):
+                        if self.config.get("mail." + entrypoint.name + ".on", False):
                                 ext = entrypoint.load()
                                 if hasattr(ext, "stop"): ext.stop()
                 
                 # Unload the provider and manager.
-                if turbomail.provider and hasattr(turbomail.provider, "stop"): turbomail.provider.stop()
-                if turbomail.manager and hasattr(turbomail.manager, "stop"): turbomail.manager.stop()
+                if self.provider and hasattr(self.provider, "stop"): self.provider.stop()
+                if self.manager and hasattr(self.manager, "stop"): self.manager.stop()
                 
-                turbomail.provider = None
-                turbomail.manager = None
+                self.provider = None
+                self.manager = None
                 
                 self.running = False
+        
+        def send(self, message):
+                if not self.manager:
+                        raise MailNotEnabledError
+
+                return self.manager.deliver(message)
+