[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mailman-cvs
Subject:    [Mailman-checkins] [Branch ~mailman-coders/mailman/3.0] Rev 6705:
From:       noreply () launchpad ! net
Date:       2009-03-10 4:10:11
Message-ID: 20090310041011.15373.26099.launchpad () loganberry ! canonical ! com
[Download RAW message or body]

------------------------------------------------------------
revno: 6705
committer: Barry Warsaw <barry@list.org>
branch nick: setup
timestamp: Mon 2009-03-09 23:49:20 -0400
message:
  Get rid of the mailman.handlers entry point.
modified:
  setup.py
  src/mailman/core/pipelines.py
  src/mailman/pipeline/__init__.py

=== modified file 'setup.py'
--- setup.py	2009-03-10 03:42:21 +0000
+++ setup.py	2009-03-10 03:49:20 +0000
@@ -86,7 +86,6 @@
     include_package_data = True,
     entry_points    = {
         'console_scripts'   : list(scripts),
-        'mailman.handlers'  : 'default = mailman.pipeline:initialize',
         'mailman.rules'     : 'default = mailman.rules:initialize',
         'mailman.scrubber'  : 'stock = mailman.archiving.pipermail:Pipermail',
         },

=== modified file 'src/mailman/core/pipelines.py'
--- src/mailman/core/pipelines.py	2009-01-17 02:04:21 +0000
+++ src/mailman/core/pipelines.py	2009-03-10 03:49:20 +0000
@@ -30,10 +30,10 @@
 from zope.interface.verify import verifyObject
 
 from mailman.config import config
-from mailman.core.plugins import get_plugins
 from mailman.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.pipeline import IPipeline
+from mailman.pipeline import builtin_handlers
 
 
 
@@ -111,14 +111,13 @@
 def initialize():
     """Initialize the pipelines."""
     # Find all handlers in the registered plugins.
-    for handler_finder in get_plugins('mailman.handlers'):
-        for handler_class in handler_finder():
-            handler = handler_class()
-            verifyObject(IHandler, handler)
-            assert handler.name not in config.handlers, (
-                'Duplicate handler "{0}" found in {1}'.format(
-                    handler.name, handler_finder))
-            config.handlers[handler.name] = handler
+    for handler_class in builtin_handlers():
+        handler = handler_class()
+        verifyObject(IHandler, handler)
+        assert handler.name not in config.handlers, (
+            'Duplicate handler "{0}" found in {1}'.format(
+                handler.name, handler_finder))
+        config.handlers[handler.name] = handler
     # Set up some pipelines.
     for pipeline_class in (BuiltInPipeline, VirginPipeline):
         pipeline = pipeline_class()

=== modified file 'src/mailman/pipeline/__init__.py'
--- src/mailman/pipeline/__init__.py	2009-01-17 02:04:21 +0000
+++ src/mailman/pipeline/__init__.py	2009-03-10 03:49:20 +0000
@@ -21,7 +21,7 @@
 
 __metaclass__ = type
 __all__ = [
-    'initialize',
+    'builtin_handlers',
     ]
 
 
@@ -32,7 +32,7 @@
 
 
 
-def initialize():
+def builtin_handlers():
     """Initialize the built-in handlers.
 
     Rules are auto-discovered by searching for IHandler implementations in all



--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0

Your team Mailman Checkins is subscribed to branch lp:mailman.
To unsubscribe from this branch go to \
https://code.launchpad.net/~mailman-coders/mailman/3.0/+edit-subscription. \
_______________________________________________ Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/mailman-cvs%40progressive-comp.com



[prev in list] [next in list] [prev in thread] [next in thread]