42 files changed, 13 insertions, 13 deletions
diff --git a/src/mailman/core/pipelines.py b/src/mailman/core/pipelines.py
index d5cee588b..9d24cc61f 100644
--- a/src/mailman/core/pipelines.py
+++ b/src/mailman/core/pipelines.py
@@ -131,7 +131,7 @@ class VirginPipeline(BasePipeline):
 def initialize():
     """Initialize the pipelines."""
     # Find all handlers in the registered plugins.
-    for handler_class in find_components('mailman.pipeline', IHandler):
+    for handler_class in find_components('mailman.handlers', IHandler):
         handler = handler_class()
         verifyObject(IHandler, handler)
         assert handler.name not in config.handlers, (
diff --git a/src/mailman/pipeline/__init__.py b/src/mailman/handlers/__init__.py
index e69de29bb..e69de29bb 100644
--- a/src/mailman/pipeline/__init__.py
+++ b/src/mailman/handlers/__init__.py
diff --git a/src/mailman/pipeline/acknowledge.py b/src/mailman/handlers/acknowledge.py
index 0e0916337..0e0916337 100644
--- a/src/mailman/pipeline/acknowledge.py
+++ b/src/mailman/handlers/acknowledge.py
diff --git a/src/mailman/pipeline/after_delivery.py b/src/mailman/handlers/after_delivery.py
index 46007092b..46007092b 100644
--- a/src/mailman/pipeline/after_delivery.py
+++ b/src/mailman/handlers/after_delivery.py
diff --git a/src/mailman/pipeline/avoid_duplicates.py b/src/mailman/handlers/avoid_duplicates.py
index ffbc80c85..ffbc80c85 100644
--- a/src/mailman/pipeline/avoid_duplicates.py
+++ b/src/mailman/handlers/avoid_duplicates.py
diff --git a/src/mailman/pipeline/calculate_recipients.py b/src/mailman/handlers/calculate_recipients.py
index 15be07ecd..15be07ecd 100644
--- a/src/mailman/pipeline/calculate_recipients.py
+++ b/src/mailman/handlers/calculate_recipients.py
diff --git a/src/mailman/pipeline/cleanse.py b/src/mailman/handlers/cleanse.py
index 90f2a892a..605b843d0 100644
--- a/src/mailman/pipeline/cleanse.py
+++ b/src/mailman/handlers/cleanse.py
@@ -31,8 +31,8 @@ from email.utils import formataddr
 from zope.interface import implements
 
 from mailman.core.i18n import _
+from mailman.handlers.cook_headers import uheader
 from mailman.interfaces.handler import IHandler
-from mailman.pipeline.cook_headers import uheader
 
 
 log = logging.getLogger('mailman.post')
diff --git a/src/mailman/pipeline/cleanse_dkim.py b/src/mailman/handlers/cleanse_dkim.py
index d2cd32636..d2cd32636 100644
--- a/src/mailman/pipeline/cleanse_dkim.py
+++ b/src/mailman/handlers/cleanse_dkim.py
diff --git a/src/mailman/pipeline/cook_headers.py b/src/mailman/handlers/cook_headers.py
index 2d117429c..2d117429c 100644
--- a/src/mailman/pipeline/cook_headers.py
+++ b/src/mailman/handlers/cook_headers.py
diff --git a/src/mailman/pipeline/decorate.py b/src/mailman/handlers/decorate.py
index d6d156048..d6d156048 100644
--- a/src/mailman/pipeline/decorate.py
+++ b/src/mailman/handlers/decorate.py
diff --git a/src/mailman/pipeline/docs/ack-headers.rst b/src/mailman/handlers/docs/ack-headers.rst
index dba2169e2..e700e2fd1 100644
--- a/src/mailman/pipeline/docs/ack-headers.rst
+++ b/src/mailman/handlers/docs/ack-headers.rst
@@ -21,7 +21,7 @@ added.
     ... A message of great import.
     ... """)
 
-    >>> from mailman.pipeline.cook_headers import process
+    >>> from mailman.handlers.cook_headers import process
     >>> process(mlist, msg, dict(noack=True))
     >>> print msg.as_string()
     From: aperson@example.com
diff --git a/src/mailman/pipeline/docs/acknowledge.rst b/src/mailman/handlers/docs/acknowledge.rst
index 479aa4ea6..479aa4ea6 100644
--- a/src/mailman/pipeline/docs/acknowledge.rst
+++ b/src/mailman/handlers/docs/acknowledge.rst
diff --git a/src/mailman/pipeline/docs/after-delivery.rst b/src/mailman/handlers/docs/after-delivery.rst
index c3e393cf2..c3e393cf2 100644
--- a/src/mailman/pipeline/docs/after-delivery.rst
+++ b/src/mailman/handlers/docs/after-delivery.rst
diff --git a/src/mailman/pipeline/docs/archives.rst b/src/mailman/handlers/docs/archives.rst
index 323d121e8..323d121e8 100644
--- a/src/mailman/pipeline/docs/archives.rst
+++ b/src/mailman/handlers/docs/archives.rst
diff --git a/src/mailman/pipeline/docs/avoid-duplicates.rst b/src/mailman/handlers/docs/avoid-duplicates.rst
index 1e46793c2..1e46793c2 100644
--- a/src/mailman/pipeline/docs/avoid-duplicates.rst
+++ b/src/mailman/handlers/docs/avoid-duplicates.rst
diff --git a/src/mailman/pipeline/docs/calc-recips.rst b/src/mailman/handlers/docs/calc-recips.rst
index 6dca85816..6dca85816 100644
--- a/src/mailman/pipeline/docs/calc-recips.rst
+++ b/src/mailman/handlers/docs/calc-recips.rst
diff --git a/src/mailman/pipeline/docs/cleanse.rst b/src/mailman/handlers/docs/cleanse.rst
index 61dfa8f52..61dfa8f52 100644
--- a/src/mailman/pipeline/docs/cleanse.rst
+++ b/src/mailman/handlers/docs/cleanse.rst
diff --git a/src/mailman/pipeline/docs/cook-headers.rst b/src/mailman/handlers/docs/cook-headers.rst
index e0313f53a..948628d54 100644
--- a/src/mailman/pipeline/docs/cook-headers.rst
+++ b/src/mailman/handlers/docs/cook-headers.rst
@@ -26,7 +26,7 @@ will place the sender in the message metadata for safe keeping.
     ... """)
     >>> msgdata = {}
 
-    >>> from mailman.pipeline.cook_headers import process
+    >>> from mailman.handlers.cook_headers import process
     >>> process(mlist, msg, msgdata)
     >>> print msgdata['original_sender']
     aperson@example.com
diff --git a/src/mailman/pipeline/docs/decorate.rst b/src/mailman/handlers/docs/decorate.rst
index 6fa8212ac..eae8ea904 100644
--- a/src/mailman/pipeline/docs/decorate.rst
+++ b/src/mailman/handlers/docs/decorate.rst
@@ -22,7 +22,7 @@ Digest messages get decorated during the digest creation phase so no extra
 decorations are added for digest messages.
 ::
 
-    >>> from mailman.pipeline.decorate import process
+    >>> from mailman.handlers.decorate import process
     >>> process(mlist, msg, dict(isdigest=True))
     >>> print msg.as_string()
     From: aperson@example.org
diff --git a/src/mailman/pipeline/docs/digests.rst b/src/mailman/handlers/docs/digests.rst
index d4d563180..d4d563180 100644
--- a/src/mailman/pipeline/docs/digests.rst
+++ b/src/mailman/handlers/docs/digests.rst
diff --git a/src/mailman/pipeline/docs/file-recips.rst b/src/mailman/handlers/docs/file-recips.rst
index 7d157ccc5..7d157ccc5 100644
--- a/src/mailman/pipeline/docs/file-recips.rst
+++ b/src/mailman/handlers/docs/file-recips.rst
diff --git a/src/mailman/pipeline/docs/filtering.rst b/src/mailman/handlers/docs/filtering.rst
index fd0b33d3b..fd0b33d3b 100644
--- a/src/mailman/pipeline/docs/filtering.rst
+++ b/src/mailman/handlers/docs/filtering.rst
diff --git a/src/mailman/pipeline/docs/nntp.rst b/src/mailman/handlers/docs/nntp.rst
index 874712397..874712397 100644
--- a/src/mailman/pipeline/docs/nntp.rst
+++ b/src/mailman/handlers/docs/nntp.rst
diff --git a/src/mailman/pipeline/docs/reply-to.rst b/src/mailman/handlers/docs/reply-to.rst
index e08fea81d..d421e2dc5 100644
--- a/src/mailman/pipeline/docs/reply-to.rst
+++ b/src/mailman/handlers/docs/reply-to.rst
@@ -46,7 +46,7 @@ original message, the list's posting address simply gets inserted.
     ...
     ... """)
 
-    >>> from mailman.pipeline.cook_headers import process
+    >>> from mailman.handlers.cook_headers import process
     >>> process(mlist, msg, {})
     >>> len(msg.get_all('reply-to'))
     1
diff --git a/src/mailman/pipeline/docs/replybot.rst b/src/mailman/handlers/docs/replybot.rst
index 7cdd7c928..7cdd7c928 100644
--- a/src/mailman/pipeline/docs/replybot.rst
+++ b/src/mailman/handlers/docs/replybot.rst
diff --git a/src/mailman/pipeline/docs/rfc-2369.rst b/src/mailman/handlers/docs/rfc-2369.rst
index 1b89f2354..0461f27ba 100644
--- a/src/mailman/pipeline/docs/rfc-2369.rst
+++ b/src/mailman/handlers/docs/rfc-2369.rst
@@ -28,7 +28,7 @@ headers generally start with the `List-` prefix.
 
 The `rfc-2369` handler adds the `List-` headers.  `List-Id` is always added.
 
-    >>> from mailman.pipeline.rfc_2369 import process
+    >>> from mailman.handlers.rfc_2369 import process
     >>> msg = message_from_string("""\
     ... From: aperson@example.com
     ...
diff --git a/src/mailman/pipeline/docs/subject-munging.rst b/src/mailman/handlers/docs/subject-munging.rst
index e7a6553ce..48cee8e2b 100644
--- a/src/mailman/pipeline/docs/subject-munging.rst
+++ b/src/mailman/handlers/docs/subject-munging.rst
@@ -29,7 +29,7 @@ subject munging, a mailing list must have a preferred language.
     ... """)
     >>> msgdata = {}
 
-    >>> from mailman.pipeline.cook_headers import process
+    >>> from mailman.handlers.cook_headers import process
     >>> process(mlist, msg, msgdata)
 
 The original subject header is stored in the message metadata.  We must print
diff --git a/src/mailman/pipeline/docs/tagger.rst b/src/mailman/handlers/docs/tagger.rst
index 80e682119..b64b05c54 100644
--- a/src/mailman/pipeline/docs/tagger.rst
+++ b/src/mailman/handlers/docs/tagger.rst
@@ -26,7 +26,7 @@ are defined.
     ... """)
     >>> msgdata = {}
 
-    >>> from mailman.pipeline.tagger import process
+    >>> from mailman.handlers.tagger import process
     >>> process(mlist, msg, msgdata)
     >>> print msg.as_string()
     Subject: foobar
diff --git a/src/mailman/pipeline/docs/to-outgoing.rst b/src/mailman/handlers/docs/to-outgoing.rst
index 816aa4ca6..816aa4ca6 100644
--- a/src/mailman/pipeline/docs/to-outgoing.rst
+++ b/src/mailman/handlers/docs/to-outgoing.rst
diff --git a/src/mailman/pipeline/file_recipients.py b/src/mailman/handlers/file_recipients.py
index d087ff2bb..d087ff2bb 100644
--- a/src/mailman/pipeline/file_recipients.py
+++ b/src/mailman/handlers/file_recipients.py
diff --git a/src/mailman/pipeline/mime_delete.py b/src/mailman/handlers/mime_delete.py
index c9c1eb408..c9c1eb408 100644
--- a/src/mailman/pipeline/mime_delete.py
+++ b/src/mailman/handlers/mime_delete.py
diff --git a/src/mailman/pipeline/owner_recipients.py b/src/mailman/handlers/owner_recipients.py
index 9e4bbf174..9e4bbf174 100644
--- a/src/mailman/pipeline/owner_recipients.py
+++ b/src/mailman/handlers/owner_recipients.py
diff --git a/src/mailman/pipeline/replybot.py b/src/mailman/handlers/replybot.py
index 83aa40214..83aa40214 100644
--- a/src/mailman/pipeline/replybot.py
+++ b/src/mailman/handlers/replybot.py
diff --git a/src/mailman/pipeline/rfc_2369.py b/src/mailman/handlers/rfc_2369.py
index 26bfe094c..ece4e83cb 100644
--- a/src/mailman/pipeline/rfc_2369.py
+++ b/src/mailman/handlers/rfc_2369.py
@@ -30,8 +30,9 @@ from zope.interface import implements
 
 from mailman.config import config
 from mailman.core.i18n import _
+from mailman.handlers.cook_headers import uheader
 from mailman.interfaces.handler import IHandler
-from mailman.pipeline.cook_headers import uheader
+
 
 CONTINUATION = ',\n\t'
 
diff --git a/src/mailman/pipeline/tagger.py b/src/mailman/handlers/tagger.py
index 49e004a12..49e004a12 100644
--- a/src/mailman/pipeline/tagger.py
+++ b/src/mailman/handlers/tagger.py
diff --git a/src/mailman/pipeline/tests/__init__.py b/src/mailman/handlers/tests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/src/mailman/pipeline/tests/__init__.py
+++ b/src/mailman/handlers/tests/__init__.py
diff --git a/src/mailman/pipeline/tests/test_mimedel.py b/src/mailman/handlers/tests/test_mimedel.py
index 566c1a40c..6ca34b17b 100644
--- a/src/mailman/pipeline/tests/test_mimedel.py
+++ b/src/mailman/handlers/tests/test_mimedel.py
@@ -32,10 +32,10 @@ from zope.component import getUtility
 from mailman.app.lifecycle import create_list
 from mailman.config import config
 from mailman.core import errors
+from mailman.handlers import mime_delete
 from mailman.interfaces.action import FilterAction
 from mailman.interfaces.member import MemberRole
 from mailman.interfaces.usermanager import IUserManager
-from mailman.pipeline import mime_delete
 from mailman.testing.helpers import (
     LogFileMark,
     get_queue_messages,
diff --git a/src/mailman/pipeline/to_archive.py b/src/mailman/handlers/to_archive.py
index fd5259a14..fd5259a14 100644
--- a/src/mailman/pipeline/to_archive.py
+++ b/src/mailman/handlers/to_archive.py
diff --git a/src/mailman/pipeline/to_digest.py b/src/mailman/handlers/to_digest.py
index 698f16e1e..698f16e1e 100644
--- a/src/mailman/pipeline/to_digest.py
+++ b/src/mailman/handlers/to_digest.py
diff --git a/src/mailman/pipeline/to_outgoing.py b/src/mailman/handlers/to_outgoing.py
index 971f87757..971f87757 100644
--- a/src/mailman/pipeline/to_outgoing.py
+++ b/src/mailman/handlers/to_outgoing.py
diff --git a/src/mailman/pipeline/to_usenet.py b/src/mailman/handlers/to_usenet.py
index 26a383c64..26a383c64 100644
--- a/src/mailman/pipeline/to_usenet.py
+++ b/src/mailman/handlers/to_usenet.py
diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py
index 513a20322..afc11f732 100644
--- a/src/mailman/runners/digest.py
+++ b/src/mailman/runners/digest.py
@@ -41,11 +41,10 @@ from email.utils import formatdate, getaddresses, make_msgid
 from urllib2 import URLError
 
 from mailman.config import config
-from mailman.core.errors import DiscardMessage
 from mailman.core.i18n import _
 from mailman.core.runner import Runner
+from mailman.handlers.decorate import decorate
 from mailman.interfaces.member import DeliveryMode, DeliveryStatus
-from mailman.pipeline.decorate import decorate
 from mailman.utilities.i18n import make
 from mailman.utilities.mailbox import Mailbox
 from mailman.utilities.string import oneline, wrap