40 files changed, 23 insertions, 23 deletions

diff --git a/Mailman/handlers/__init__.py b/Mailman/pipeline/__init__.py
index e69de29bb..e69de29bb 100644
--- a/Mailman/handlers/__init__.py
+++ b/Mailman/pipeline/__init__.py
diff --git a/Mailman/handlers/acknowledge.py b/Mailman/pipeline/acknowledge.py
index cf8e3d338..cf8e3d338 100644
--- a/Mailman/handlers/acknowledge.py
+++ b/Mailman/pipeline/acknowledge.py
diff --git a/Mailman/handlers/after_delivery.py b/Mailman/pipeline/after_delivery.py
index 512b83249..512b83249 100644
--- a/Mailman/handlers/after_delivery.py
+++ b/Mailman/pipeline/after_delivery.py
diff --git a/Mailman/handlers/avoid_duplicates.py b/Mailman/pipeline/avoid_duplicates.py
index 2c52a7781..2c52a7781 100644
--- a/Mailman/handlers/avoid_duplicates.py
+++ b/Mailman/pipeline/avoid_duplicates.py
diff --git a/Mailman/handlers/calculate_recipients.py b/Mailman/pipeline/calculate_recipients.py
index 5cc552c25..5cc552c25 100644
--- a/Mailman/handlers/calculate_recipients.py
+++ b/Mailman/pipeline/calculate_recipients.py
diff --git a/Mailman/handlers/cleanse.py b/Mailman/pipeline/cleanse.py
index cc2c8a345..24e1af340 100644
--- a/Mailman/handlers/cleanse.py
+++ b/Mailman/pipeline/cleanse.py
@@ -21,7 +21,7 @@ import logging
 
 from email.Utils import formataddr
 
-from Mailman.handlers.cook_headers import uheader
+from Mailman.pipeline.cook_headers import uheader
 
 log = logging.getLogger('mailman.post')
 
diff --git a/Mailman/handlers/cleanse_dkim.py b/Mailman/pipeline/cleanse_dkim.py
index f35350acc..f35350acc 100644
--- a/Mailman/handlers/cleanse_dkim.py
+++ b/Mailman/pipeline/cleanse_dkim.py
diff --git a/Mailman/handlers/cook_headers.py b/Mailman/pipeline/cook_headers.py
index 4797de62b..4797de62b 100644
--- a/Mailman/handlers/cook_headers.py
+++ b/Mailman/pipeline/cook_headers.py
diff --git a/Mailman/handlers/decorate.py b/Mailman/pipeline/decorate.py
index f4b6551e3..f4b6551e3 100644
--- a/Mailman/handlers/decorate.py
+++ b/Mailman/pipeline/decorate.py
diff --git a/Mailman/handlers/docs/ack-headers.txt b/Mailman/pipeline/docs/ack-headers.txt
index 17d0f2654..8926e6d91 100644
--- a/Mailman/handlers/docs/ack-headers.txt
+++ b/Mailman/pipeline/docs/ack-headers.txt
@@ -7,7 +7,7 @@ transformations.  Some headers get added, others get changed.  Some of these
 changes depend on mailing list settings and others depend on how the message
 is getting sent through the system.  We'll take things one-by-one.
 
-    >>> from Mailman.handlers.cook_headers import process
+    >>> from Mailman.pipeline.cook_headers import process
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.subject_prefix = u''
 
diff --git a/Mailman/handlers/docs/acknowledge.txt b/Mailman/pipeline/docs/acknowledge.txt
index fa586c560..615697e70 100644
--- a/Mailman/handlers/docs/acknowledge.txt
+++ b/Mailman/pipeline/docs/acknowledge.txt
@@ -5,7 +5,7 @@ When a user posts a message to a mailing list, and that user has chosen to
 receive acknowledgments of their postings, Mailman will sent them such an
 acknowledgment.
 
-    >>> from Mailman.handlers.acknowledge import process
+    >>> from Mailman.pipeline.acknowledge import process
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.real_name = u'XTest'
     >>> mlist.preferred_language = u'en'
diff --git a/Mailman/handlers/docs/after-delivery.txt b/Mailman/pipeline/docs/after-delivery.txt
index 784a142ec..fa4c6914d 100644
--- a/Mailman/handlers/docs/after-delivery.txt
+++ b/Mailman/pipeline/docs/after-delivery.txt
@@ -6,7 +6,7 @@ by the rest of the handlers in the incoming queue pipeline, a couple of
 bookkeeping pieces of information are updated.
 
     >>> import datetime
-    >>> from Mailman.handlers.after_delivery import process
+    >>> from Mailman.pipeline.after_delivery import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> post_time = datetime.datetime.now() - datetime.timedelta(minutes=10)
diff --git a/Mailman/handlers/docs/archives.txt b/Mailman/pipeline/docs/archives.txt
index ffae9ee1c..f902ab59e 100644
--- a/Mailman/handlers/docs/archives.txt
+++ b/Mailman/pipeline/docs/archives.txt
@@ -7,7 +7,7 @@ delivery processes while messages are archived.  This also allows external
 archivers to work in a separate process from the main Mailman delivery
 processes.
 
-    >>> from Mailman.handlers.to_archive import process
+    >>> from Mailman.pipeline.to_archive import process
     >>> from Mailman.queue import Switchboard
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
diff --git a/Mailman/handlers/docs/avoid-duplicates.txt b/Mailman/pipeline/docs/avoid-duplicates.txt
index 095591844..5e38eaae8 100644
--- a/Mailman/handlers/docs/avoid-duplicates.txt
+++ b/Mailman/pipeline/docs/avoid-duplicates.txt
@@ -6,7 +6,7 @@ reduce the reception of duplicate messages.  It does this by removing certain
 recipients from the list of recipients that earlier handler modules
 (e.g. CalcRecips) calculates.
 
-    >>> from Mailman.handlers.avoid_duplicates import process
+    >>> from Mailman.pipeline.avoid_duplicates import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
 
diff --git a/Mailman/handlers/docs/calc-recips.txt b/Mailman/pipeline/docs/calc-recips.txt
index 8335167f6..f2a9b3113 100644
--- a/Mailman/handlers/docs/calc-recips.txt
+++ b/Mailman/pipeline/docs/calc-recips.txt
@@ -5,7 +5,7 @@ Every message that makes it through to the list membership gets sent to a set
 of recipient addresses.  These addresses are calculated by one of the handler
 modules and depends on a host of factors.
 
-    >>> from Mailman.handlers.calculate_recipients import process
+    >>> from Mailman.pipeline.calculate_recipients import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
 
diff --git a/Mailman/handlers/docs/cleanse.txt b/Mailman/pipeline/docs/cleanse.txt
index 29177f853..09cd49f08 100644
--- a/Mailman/handlers/docs/cleanse.txt
+++ b/Mailman/pipeline/docs/cleanse.txt
@@ -5,7 +5,7 @@ All messages posted to a list get their headers cleansed.  Some headers are
 related to additional permissions that can be granted to the message and other
 headers can be used to fish for membership.
 
-    >>> from Mailman.handlers.cleanse import process
+    >>> from Mailman.pipeline.cleanse import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
 
diff --git a/Mailman/handlers/docs/cook-headers.txt b/Mailman/pipeline/docs/cook-headers.txt
index 719cedcc9..59b9666fb 100644
--- a/Mailman/handlers/docs/cook-headers.txt
+++ b/Mailman/pipeline/docs/cook-headers.txt
@@ -7,7 +7,7 @@ transformations.  Some headers get added, others get changed.  Some of these
 changes depend on mailing list settings and others depend on how the message
 is getting sent through the system.  We'll take things one-by-one.
 
-    >>> from Mailman.handlers.cook_headers import process
+    >>> from Mailman.pipeline.cook_headers import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.subject_prefix = u''
diff --git a/Mailman/handlers/docs/decorate.txt b/Mailman/pipeline/docs/decorate.txt
index 010cfa7ae..10869f047 100644
--- a/Mailman/handlers/docs/decorate.txt
+++ b/Mailman/pipeline/docs/decorate.txt
@@ -5,7 +5,7 @@ Message decoration is the process of adding headers and footers to the
 original message.  A handler module takes care of this based on the settings
 of the mailing list and the type of message being processed.
 
-    >>> from Mailman.handlers.decorate import process
+    >>> from Mailman.pipeline.decorate import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> msg_text = """\
diff --git a/Mailman/handlers/docs/digests.txt b/Mailman/pipeline/docs/digests.txt
index 7eadede95..5e33050da 100644
--- a/Mailman/handlers/docs/digests.txt
+++ b/Mailman/pipeline/docs/digests.txt
@@ -6,7 +6,7 @@ as individual messages when immediately posted.  There are several forms of
 digests, although only two are currently supported: MIME digests and RFC 1153
 (a.k.a. plain text) digests.
 
-    >>> from Mailman.handlers.to_digest import process
+    >>> from Mailman.pipeline.to_digest import process
     >>> from Mailman.queue import Switchboard
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
diff --git a/Mailman/handlers/docs/file-recips.txt b/Mailman/pipeline/docs/file-recips.txt
index cd2f54c24..a5824ce70 100644
--- a/Mailman/handlers/docs/file-recips.txt
+++ b/Mailman/pipeline/docs/file-recips.txt
@@ -5,7 +5,7 @@ Mailman can calculate the recipients for a message from a Sendmail-style
 include file.  This file must be called members.txt and it must live in the
 list's data directory.
 
-    >>> from Mailman.handlers.file_recipients import process
+    >>> from Mailman.pipeline.file_recipients import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
 
diff --git a/Mailman/handlers/docs/filtering.txt b/Mailman/pipeline/docs/filtering.txt
index 348f8e817..cfec13291 100644
--- a/Mailman/handlers/docs/filtering.txt
+++ b/Mailman/pipeline/docs/filtering.txt
@@ -6,7 +6,7 @@ stripping MIME subparts, and possibly reorganizing the MIME structure of a
 message.  It does this with the MimeDel handler module, although other
 handlers can potentially do other kinds of finer level content filtering.
 
-    >>> from Mailman.handlers.mime_delete import process
+    >>> from Mailman.pipeline.mime_delete import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.preferred_language = u'en'
diff --git a/Mailman/handlers/docs/nntp.txt b/Mailman/pipeline/docs/nntp.txt
index 23b90a83b..0a8fe625d 100644
--- a/Mailman/handlers/docs/nntp.txt
+++ b/Mailman/pipeline/docs/nntp.txt
@@ -5,7 +5,7 @@ Mailman has an NNTP gateway, whereby messages posted to the mailing list can
 be forwarded onto an NNTP newsgroup.  Typically this means Usenet, but since
 NNTP is to Usenet as IP is to the web, it's more general than that.
 
-    >>> from Mailman.handlers.to_usenet import process
+    >>> from Mailman.pipeline.to_usenet import process
     >>> from Mailman.queue import Switchboard
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
diff --git a/Mailman/handlers/docs/reply-to.txt b/Mailman/pipeline/docs/reply-to.txt
index 3850c575b..f4ac1a41b 100644
--- a/Mailman/handlers/docs/reply-to.txt
+++ b/Mailman/pipeline/docs/reply-to.txt
@@ -7,7 +7,7 @@ transformations.  Some headers get added, others get changed.  Some of these
 changes depend on mailing list settings and others depend on how the message
 is getting sent through the system.  We'll take things one-by-one.
 
-    >>> from Mailman.handlers.cook_headers import process
+    >>> from Mailman.pipeline.cook_headers import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.subject_prefix = u''
diff --git a/Mailman/handlers/docs/replybot.txt b/Mailman/pipeline/docs/replybot.txt
index 1527b7531..89e4a9188 100644
--- a/Mailman/handlers/docs/replybot.txt
+++ b/Mailman/pipeline/docs/replybot.txt
@@ -6,7 +6,7 @@ it receives on its posting address, or special robot addresses.  Automatic
 responses are subject to various conditions, such as headers in the original
 message or the amount of time since the last auto-response.
 
-    >>> from Mailman.handlers.replybot import process
+    >>> from Mailman.pipeline.replybot import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.real_name = u'XTest'
diff --git a/Mailman/handlers/docs/scrubber.txt b/Mailman/pipeline/docs/scrubber.txt
index 515bbd1e5..ab83b9a2b 100644
--- a/Mailman/handlers/docs/scrubber.txt
+++ b/Mailman/pipeline/docs/scrubber.txt
@@ -6,7 +6,7 @@ messages and in components such as the archiver.  Its primary purpose is to
 scrub attachments from messages so that binary goop doesn't end up in an
 archive message.
 
-    >>> from Mailman.handlers.scrubber import process, save_attachment
+    >>> from Mailman.pipeline.scrubber import process, save_attachment
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.preferred_language = u'en'
diff --git a/Mailman/handlers/docs/subject-munging.txt b/Mailman/pipeline/docs/subject-munging.txt
index dc8bc512f..73abf3e3a 100644
--- a/Mailman/handlers/docs/subject-munging.txt
+++ b/Mailman/pipeline/docs/subject-munging.txt
@@ -7,7 +7,7 @@ transformations.  Some headers get added, others get changed.  Some of these
 changes depend on mailing list settings and others depend on how the message
 is getting sent through the system.  We'll take things one-by-one.
 
-    >>> from Mailman.handlers.cook_headers import process
+    >>> from Mailman.pipeline.cook_headers import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.subject_prefix = u''
diff --git a/Mailman/handlers/docs/tagger.txt b/Mailman/pipeline/docs/tagger.txt
index 20dcb590e..81afb739c 100644
--- a/Mailman/handlers/docs/tagger.txt
+++ b/Mailman/pipeline/docs/tagger.txt
@@ -8,7 +8,7 @@ double duty as the 'topic tag'.  Each message that flows the mailing list has
 its Subject: and Keywords: headers compared against these regular
 expressions.  The message then gets tagged with the topic names of each hit.
 
-    >>> from Mailman.handlers.tagger import process
+    >>> from Mailman.pipeline.tagger import process
     >>> from Mailman.queue import Switchboard
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
diff --git a/Mailman/handlers/file_recipients.py b/Mailman/pipeline/file_recipients.py
index 0bee969f6..0bee969f6 100644
--- a/Mailman/handlers/file_recipients.py
+++ b/Mailman/pipeline/file_recipients.py
diff --git a/Mailman/handlers/mime_delete.py b/Mailman/pipeline/mime_delete.py
index f8a9f4ddd..f8a9f4ddd 100644
--- a/Mailman/handlers/mime_delete.py
+++ b/Mailman/pipeline/mime_delete.py
diff --git a/Mailman/handlers/moderate.py b/Mailman/pipeline/moderate.py
index fed77e6f9..fed77e6f9 100644
--- a/Mailman/handlers/moderate.py
+++ b/Mailman/pipeline/moderate.py
diff --git a/Mailman/handlers/owner_recipients.py b/Mailman/pipeline/owner_recipients.py
index 954036241..954036241 100644
--- a/Mailman/handlers/owner_recipients.py
+++ b/Mailman/pipeline/owner_recipients.py
diff --git a/Mailman/handlers/replybot.py b/Mailman/pipeline/replybot.py
index ec48097af..ec48097af 100644
--- a/Mailman/handlers/replybot.py
+++ b/Mailman/pipeline/replybot.py
diff --git a/Mailman/handlers/scrubber.py b/Mailman/pipeline/scrubber.py
index fb1b6e602..fb1b6e602 100644
--- a/Mailman/handlers/scrubber.py
+++ b/Mailman/pipeline/scrubber.py
diff --git a/Mailman/handlers/smtp_direct.py b/Mailman/pipeline/smtp_direct.py
index e3d4e7b8c..e3d4e7b8c 100644
--- a/Mailman/handlers/smtp_direct.py
+++ b/Mailman/pipeline/smtp_direct.py
diff --git a/Mailman/handlers/tagger.py b/Mailman/pipeline/tagger.py
index 0a87d8407..0a87d8407 100644
--- a/Mailman/handlers/tagger.py
+++ b/Mailman/pipeline/tagger.py
diff --git a/Mailman/handlers/to_archive.py b/Mailman/pipeline/to_archive.py
index e67513c84..e67513c84 100644
--- a/Mailman/handlers/to_archive.py
+++ b/Mailman/pipeline/to_archive.py
diff --git a/Mailman/handlers/to_digest.py b/Mailman/pipeline/to_digest.py
index e142f1185..f126ac3fe 100644
--- a/Mailman/handlers/to_digest.py
+++ b/Mailman/pipeline/to_digest.py
@@ -50,8 +50,8 @@ from Mailman import i18n
 from Mailman.Mailbox import Mailbox
 from Mailman.Mailbox import Mailbox
 from Mailman.configuration import config
-from Mailman.handlers.decorate import decorate
-from Mailman.handlers.scrubber import process as scrubber
+from Mailman.pipeline.decorate import decorate
+from Mailman.pipeline.scrubber import process as scrubber
 from Mailman.interfaces import DeliveryMode, DeliveryStatus
 from Mailman.queue import Switchboard
 
@@ -313,7 +313,7 @@ def send_i18n_digests(mlist, mboxfp):
         else:
             print >> plainmsg, separator30
             print >> plainmsg
-        # Use Mailman.Handlers.Scrubber.process() to get plain text
+        # Use Mailman.pipeline.scrubber.process() to get plain text
         try:
             msg = scrubber(mlist, msg)
         except Errors.DiscardMessage:
diff --git a/Mailman/handlers/to_outgoing.py b/Mailman/pipeline/to_outgoing.py
index 21ba8b0d5..21ba8b0d5 100644
--- a/Mailman/handlers/to_outgoing.py
+++ b/Mailman/pipeline/to_outgoing.py
diff --git a/Mailman/handlers/to_usenet.py b/Mailman/pipeline/to_usenet.py
index f7edb2381..f7edb2381 100644
--- a/Mailman/handlers/to_usenet.py
+++ b/Mailman/pipeline/to_usenet.py
diff --git a/Mailman/queue/docs/outgoing.txt b/Mailman/queue/docs/outgoing.txt
index 7b5ba6f54..a9c031408 100644
--- a/Mailman/queue/docs/outgoing.txt
+++ b/Mailman/queue/docs/outgoing.txt
@@ -9,7 +9,7 @@ term somewhat incorrectly, but within the spirit of the standard, which
 basically describes how to encode the recipient's address in the originator
 headers for unambigous bounce processing.
 
-    >>> from Mailman.handlers.to_outgoing import process
+    >>> from Mailman.pipeline.to_outgoing import process
     >>> from Mailman.queue import Switchboard
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')