Changeset 102 for trunk

Timestamp:

10/04/08 11:14:31 (3 months ago)

Author:

fs

Message:

adds the ability not to use setuptools for manager/provider class lookup (#75)

Files:

• trunk/turbomail/control.py (modified) (5 diffs)

trunk/turbomail/control.py

@@ -45 +45 @@
         self.manager = None
         self.provider = None
-        
+    
     def __load_single_entry(self, group, name):
         for entrypoint in pkg_resources.iter_entry_points(group, name):
@@ -51 +51 @@
         return None
     
-    def start(self):
+    def start(self, extra_classes=None):
         if not self.config.get("mail.on", False):
             return
@@ -57 +57 @@
         log.info("TurboMail extension starting up.")
         
-        def load(t, default):
+        def load(t, default, extra_classes):
             extension = self.config.get("mail.%s" % t, default)
-            controller = self.__load_single_entry("turbomail.%ss" % t, extension)
+            if extra_classes != None and extension in extra_classes:
+                controller = extra_classes[extension]
+                if isinstance(controller, type):
+                    controller = controller()
+            else:
+                entry_point = "turbomail.%ss" % t
+                controller = self.__load_single_entry(entry_point, extension)
             if not controller:
                 self.config.update({"mail.on": False})
@@ -72 +78 @@
         
         # Load the requested manager and provider.
-        load('manager', 'immediate')
-        load('provider', 'debug')
+        load('manager', 'immediate', extra_classes)
+        load('provider', 'debug', extra_classes)
         
         # Load and initialize the various extensions.
@@ -120 +126 @@
         if not self.manager:
             raise MailNotEnabledError
+        
+        return self.manager.deliver(message)
 
-        return self.manager.deliver(message)
-