40 files changed, 22 insertions, 22 deletions

diff --git a/Mailman/Handlers/__init__.py b/Mailman/handlers/__init__.py
index e69de29bb..e69de29bb 100644
--- a/Mailman/Handlers/__init__.py
+++ b/Mailman/handlers/__init__.py
diff --git a/Mailman/Handlers/Acknowledge.py b/Mailman/handlers/acknowledge.py
index 078c3ac92..078c3ac92 100644
--- a/Mailman/Handlers/Acknowledge.py
+++ b/Mailman/handlers/acknowledge.py
diff --git a/Mailman/Handlers/AfterDelivery.py b/Mailman/handlers/after_delivery.py
index 16caf5773..16caf5773 100644
--- a/Mailman/Handlers/AfterDelivery.py
+++ b/Mailman/handlers/after_delivery.py
diff --git a/Mailman/Handlers/AvoidDuplicates.py b/Mailman/handlers/avoid_duplicates.py
index a652906a9..a652906a9 100644
--- a/Mailman/Handlers/AvoidDuplicates.py
+++ b/Mailman/handlers/avoid_duplicates.py
diff --git a/Mailman/Handlers/CalcRecips.py b/Mailman/handlers/calculate_recipients.py
index ebaf941c9..ebaf941c9 100644
--- a/Mailman/Handlers/CalcRecips.py
+++ b/Mailman/handlers/calculate_recipients.py
diff --git a/Mailman/Handlers/Cleanse.py b/Mailman/handlers/cleanse.py
index bf25a4591..cc2c8a345 100644
--- a/Mailman/Handlers/Cleanse.py
+++ b/Mailman/handlers/cleanse.py
@@ -21,7 +21,7 @@ import logging
 
 from email.Utils import formataddr
 
-from Mailman.Handlers.CookHeaders import uheader
+from Mailman.handlers.cook_headers import uheader
 
 log = logging.getLogger('mailman.post')
 
diff --git a/Mailman/Handlers/CleanseDKIM.py b/Mailman/handlers/cleanse_dkim.py
index 9dee4fcb0..9dee4fcb0 100644
--- a/Mailman/Handlers/CleanseDKIM.py
+++ b/Mailman/handlers/cleanse_dkim.py
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/handlers/cook_headers.py
index 4797de62b..4797de62b 100644
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/handlers/cook_headers.py
diff --git a/Mailman/Handlers/Decorate.py b/Mailman/handlers/decorate.py
index 6891fed8d..6891fed8d 100644
--- a/Mailman/Handlers/Decorate.py
+++ b/Mailman/handlers/decorate.py
diff --git a/Mailman/docs/ack-headers.txt b/Mailman/handlers/docs/ack-headers.txt
index 4418fc4f8..17d0f2654 100644
--- a/Mailman/docs/ack-headers.txt
+++ b/Mailman/handlers/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.CookHeaders import process
+    >>> from Mailman.handlers.cook_headers import process
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.subject_prefix = u''
 
diff --git a/Mailman/docs/acknowledge.txt b/Mailman/handlers/docs/acknowledge.txt
index 11847cf17..fa586c560 100644
--- a/Mailman/docs/acknowledge.txt
+++ b/Mailman/handlers/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.handlers.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/docs/after-delivery.txt b/Mailman/handlers/docs/after-delivery.txt
index 50f2e618a..784a142ec 100644
--- a/Mailman/docs/after-delivery.txt
+++ b/Mailman/handlers/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.AfterDelivery import process
+    >>> from Mailman.handlers.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/docs/archives.txt b/Mailman/handlers/docs/archives.txt
index d1a871ebe..ffae9ee1c 100644
--- a/Mailman/docs/archives.txt
+++ b/Mailman/handlers/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.ToArchive import process
+    >>> from Mailman.handlers.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/docs/avoid-duplicates.txt b/Mailman/handlers/docs/avoid-duplicates.txt
index 6a1b46f77..095591844 100644
--- a/Mailman/docs/avoid-duplicates.txt
+++ b/Mailman/handlers/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.AvoidDuplicates import process
+    >>> from Mailman.handlers.avoid_duplicates import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
 
diff --git a/Mailman/docs/calc-recips.txt b/Mailman/handlers/docs/calc-recips.txt
index c36841d1c..8335167f6 100644
--- a/Mailman/docs/calc-recips.txt
+++ b/Mailman/handlers/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.CalcRecips import process
+    >>> from Mailman.handlers.calculate_recipients import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
 
diff --git a/Mailman/docs/cleanse.txt b/Mailman/handlers/docs/cleanse.txt
index 1cb4c2cf8..29177f853 100644
--- a/Mailman/docs/cleanse.txt
+++ b/Mailman/handlers/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.handlers.cleanse import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
 
diff --git a/Mailman/docs/cook-headers.txt b/Mailman/handlers/docs/cook-headers.txt
index 0560373fd..719cedcc9 100644
--- a/Mailman/docs/cook-headers.txt
+++ b/Mailman/handlers/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.CookHeaders import process
+    >>> from Mailman.handlers.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/docs/decorate.txt b/Mailman/handlers/docs/decorate.txt
index 6f05c6982..010cfa7ae 100644
--- a/Mailman/docs/decorate.txt
+++ b/Mailman/handlers/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.handlers.decorate import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> msg_text = """\
diff --git a/Mailman/docs/digests.txt b/Mailman/handlers/docs/digests.txt
index aaef4c18b..7eadede95 100644
--- a/Mailman/docs/digests.txt
+++ b/Mailman/handlers/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.ToDigest import process
+    >>> from Mailman.handlers.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/docs/file-recips.txt b/Mailman/handlers/docs/file-recips.txt
index c7528a1d1..cd2f54c24 100644
--- a/Mailman/docs/file-recips.txt
+++ b/Mailman/handlers/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.FileRecips import process
+    >>> from Mailman.handlers.file_recipients import process
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
 
diff --git a/Mailman/docs/filtering.txt b/Mailman/handlers/docs/filtering.txt
index 67bef2f8e..348f8e817 100644
--- a/Mailman/docs/filtering.txt
+++ b/Mailman/handlers/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.MimeDel import process
+    >>> from Mailman.handlers.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/docs/nntp.txt b/Mailman/handlers/docs/nntp.txt
index 586c36266..23b90a83b 100644
--- a/Mailman/docs/nntp.txt
+++ b/Mailman/handlers/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.ToUsenet import process
+    >>> from Mailman.handlers.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/docs/reply-to.txt b/Mailman/handlers/docs/reply-to.txt
index b6af959ae..3850c575b 100644
--- a/Mailman/docs/reply-to.txt
+++ b/Mailman/handlers/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.CookHeaders import process
+    >>> from Mailman.handlers.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/docs/replybot.txt b/Mailman/handlers/docs/replybot.txt
index 3f0975b3f..1527b7531 100644
--- a/Mailman/docs/replybot.txt
+++ b/Mailman/handlers/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.handlers.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/docs/scrubber.txt b/Mailman/handlers/docs/scrubber.txt
index 09d2e26fa..515bbd1e5 100644
--- a/Mailman/docs/scrubber.txt
+++ b/Mailman/handlers/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.handlers.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/docs/subject-munging.txt b/Mailman/handlers/docs/subject-munging.txt
index ea11121ad..dc8bc512f 100644
--- a/Mailman/docs/subject-munging.txt
+++ b/Mailman/handlers/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.CookHeaders import process
+    >>> from Mailman.handlers.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/docs/tagger.txt b/Mailman/handlers/docs/tagger.txt
index 4898eb40e..20dcb590e 100644
--- a/Mailman/docs/tagger.txt
+++ b/Mailman/handlers/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.handlers.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/FileRecips.py b/Mailman/handlers/file_recipients.py
index 8ce07b432..8ce07b432 100644
--- a/Mailman/Handlers/FileRecips.py
+++ b/Mailman/handlers/file_recipients.py
diff --git a/Mailman/Handlers/MimeDel.py b/Mailman/handlers/mime_delete.py
index 93349cb23..93349cb23 100644
--- a/Mailman/Handlers/MimeDel.py
+++ b/Mailman/handlers/mime_delete.py
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/handlers/moderate.py
index 464215d25..464215d25 100644
--- a/Mailman/Handlers/Moderate.py
+++ b/Mailman/handlers/moderate.py
diff --git a/Mailman/Handlers/OwnerRecips.py b/Mailman/handlers/owner_recipients.py
index c70e17777..c70e17777 100644
--- a/Mailman/Handlers/OwnerRecips.py
+++ b/Mailman/handlers/owner_recipients.py
diff --git a/Mailman/Handlers/Replybot.py b/Mailman/handlers/replybot.py
index 7017d9dd5..7017d9dd5 100644
--- a/Mailman/Handlers/Replybot.py
+++ b/Mailman/handlers/replybot.py
diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/handlers/scrubber.py
index fb1b6e602..fb1b6e602 100644
--- a/Mailman/Handlers/Scrubber.py
+++ b/Mailman/handlers/scrubber.py
diff --git a/Mailman/Handlers/SMTPDirect.py b/Mailman/handlers/smtp_direct.py
index 0037d676a..0037d676a 100644
--- a/Mailman/Handlers/SMTPDirect.py
+++ b/Mailman/handlers/smtp_direct.py
diff --git a/Mailman/Handlers/Tagger.py b/Mailman/handlers/tagger.py
index 023148fd7..023148fd7 100644
--- a/Mailman/Handlers/Tagger.py
+++ b/Mailman/handlers/tagger.py
diff --git a/Mailman/Handlers/ToArchive.py b/Mailman/handlers/to_archive.py
index c65e86f60..c65e86f60 100644
--- a/Mailman/Handlers/ToArchive.py
+++ b/Mailman/handlers/to_archive.py
diff --git a/Mailman/Handlers/ToDigest.py b/Mailman/handlers/to_digest.py
index 6f06df43b..7ae1b19fe 100644
--- a/Mailman/Handlers/ToDigest.py
+++ b/Mailman/handlers/to_digest.py
@@ -47,11 +47,11 @@ from Mailman import Errors
 from Mailman import Message
 from Mailman import Utils
 from Mailman import i18n
-from Mailman.Handlers.Decorate import decorate
-from Mailman.Handlers.Scrubber import process as scrubber
 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.interfaces import DeliveryMode, DeliveryStatus
 from Mailman.queue import Switchboard
 
diff --git a/Mailman/Handlers/ToOutgoing.py b/Mailman/handlers/to_outgoing.py
index 9c8650a98..9c8650a98 100644
--- a/Mailman/Handlers/ToOutgoing.py
+++ b/Mailman/handlers/to_outgoing.py
diff --git a/Mailman/Handlers/ToUsenet.py b/Mailman/handlers/to_usenet.py
index 09bb28bdd..09bb28bdd 100644
--- a/Mailman/Handlers/ToUsenet.py
+++ b/Mailman/handlers/to_usenet.py
diff --git a/Mailman/queue/docs/outgoing.txt b/Mailman/queue/docs/outgoing.txt
index ba2c6430b..7b5ba6f54 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.ToOutgoing import process
+    >>> from Mailman.handlers.to_outgoing import process
     >>> from Mailman.queue import Switchboard
     >>> from Mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')