pipelines-dynamical-instantiation

5 files changed, 144 insertions, 79 deletions

diff --git a/src/mailman/core/pipelines.py b/src/mailman/core/pipelines.py
index 15e23a022..df07bc608 100644
--- a/src/mailman/core/pipelines.py
+++ b/src/mailman/core/pipelines.py
@@ -15,19 +15,17 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Built-in pipelines."""
+"""Application support for pipeline processing."""
 
 import logging
 
 from mailman.app.bounces import bounce_message
 from mailman.config import config
-from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.pipeline import (
     DiscardMessage, IPipeline, RejectMessage)
 from mailman.utilities.modules import add_components
 from public import public
-from zope.interface import implementer
 
 
 dlog = logging.getLogger('mailman.debug')
@@ -62,84 +60,9 @@ def process(mlist, msg, msgdata, pipeline_name='built-in'):
 
 
 @public
-@implementer(IPipeline)
-class BasePipeline:
-    """Base pipeline implementation."""
-
-    _default_handlers = ()
-
-    def __init__(self):
-        self._handlers = []
-        for handler_name in self._default_handlers:
-            self._handlers.append(config.handlers[handler_name])
-
-    def __iter__(self):
-        """See `IPipeline`."""
-        yield from self._handlers
-
-
-@public
-class OwnerPipeline(BasePipeline):
-    """The built-in owner pipeline."""
-
-    name = 'default-owner-pipeline'
-    description = _('The built-in owner pipeline.')
-
-    _default_handlers = (
-        'owner-recipients',
-        'to-outgoing',
-        )
-
-
-@public
-class PostingPipeline(BasePipeline):
-    """The built-in posting pipeline."""
-
-    name = 'default-posting-pipeline'
-    description = _('The built-in posting pipeline.')
-
-    _default_handlers = (
-        'mime-delete',
-        'tagger',
-        'member-recipients',
-        'avoid-duplicates',
-        'cleanse',
-        'cleanse-dkim',
-        'cook-headers',
-        'subject-prefix',
-        'rfc-2369',
-        'to-archive',
-        'to-digest',
-        'to-usenet',
-        'after-delivery',
-        'acknowledge',
-        'decorate',
-        'dmarc',
-        'to-outgoing',
-        )
-
-
-@public
-class VirginPipeline(BasePipeline):
-    """The processing pipeline for virgin messages.
-
-    Virgin messages are those that are crafted internally by Mailman.
-    """
-    name = 'virgin'
-    description = _('The virgin queue pipeline.')
-
-    _default_handlers = (
-        'cook-headers',
-        'to-outgoing',
-        )
-
-
-@public
 def initialize():
     """Initialize the pipelines."""
     # Find all handlers in the registered plugins.
     add_components('mailman.handlers', IHandler, config.handlers)
     # Set up some pipelines.
-    for pipeline_class in (OwnerPipeline, PostingPipeline, VirginPipeline):
-        pipeline = pipeline_class()
-        config.pipelines[pipeline.name] = pipeline
+    add_components('mailman.pipelines', IPipeline, config.pipelines)
diff --git a/src/mailman/pipelines/__init__.py b/src/mailman/pipelines/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/mailman/pipelines/__init__.py
diff --git a/src/mailman/pipelines/base.py b/src/mailman/pipelines/base.py
new file mode 100644
index 000000000..0f8af2ff0
--- /dev/null
+++ b/src/mailman/pipelines/base.py
@@ -0,0 +1,42 @@
+# Copyright (C) 2006-2017 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Base class for pipelines.."""
+
+from mailman.config import config
+from mailman.interfaces.pipeline import IPipeline
+from mailman.utilities.modules import abstract_component
+from public import public
+from zope.interface import implementer
+
+
+@public
+@abstract_component
+@implementer(IPipeline)
+class BasePipeline:
+    """Base pipeline implementation."""
+
+    _default_handlers = ()
+
+    def __init__(self):
+        self._handlers = []
+        for handler_name in self._default_handlers:
+            self._handlers.append(config.handlers[handler_name])
+
+    def __iter__(self):
+        """See `IPipeline`."""
+        yield from self._handlers
diff --git a/src/mailman/pipelines/builtin.py b/src/mailman/pipelines/builtin.py
new file mode 100644
index 000000000..760c24a89
--- /dev/null
+++ b/src/mailman/pipelines/builtin.py
@@ -0,0 +1,63 @@
+# Copyright (C) 2006-2017 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Built-in pipelines."""
+
+from mailman.core.i18n import _
+from mailman.pipelines.base import BasePipeline
+from public import public
+
+
+@public
+class OwnerPipeline(BasePipeline):
+    """The built-in owner pipeline."""
+
+    name = 'default-owner-pipeline'
+    description = _('The built-in owner pipeline.')
+
+    _default_handlers = (
+        'owner-recipients',
+        'to-outgoing',
+        )
+
+
+@public
+class PostingPipeline(BasePipeline):
+    """The built-in posting pipeline."""
+
+    name = 'default-posting-pipeline'
+    description = _('The built-in posting pipeline.')
+
+    _default_handlers = (
+        'mime-delete',
+        'tagger',
+        'member-recipients',
+        'avoid-duplicates',
+        'cleanse',
+        'cleanse-dkim',
+        'cook-headers',
+        'subject-prefix',
+        'rfc-2369',
+        'to-archive',
+        'to-digest',
+        'to-usenet',
+        'after-delivery',
+        'acknowledge',
+        'decorate',
+        'dmarc',
+        'to-outgoing',
+        )
diff --git a/src/mailman/pipelines/virgin.py b/src/mailman/pipelines/virgin.py
new file mode 100644
index 000000000..82dfc24ff
--- /dev/null
+++ b/src/mailman/pipelines/virgin.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2006-2017 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+"""A virgin pipeline."""
+
+from mailman.core.i18n import _
+from mailman.pipelines.base import BasePipeline
+from public import public
+
+
+@public
+class VirginPipeline(BasePipeline):
+    """The processing pipeline for virgin messages.
+
+    Virgin messages are those that are crafted internally by Mailman.
+    """
+    name = 'virgin'
+    description = _('The virgin queue pipeline.')
+
+    _default_handlers = (
+        'cook-headers',
+        'to-outgoing',
+        )