9 files changed, 18 insertions, 21 deletions

diff --git a/mailman/pipeline/acknowledge.py b/mailman/pipeline/acknowledge.py
index a7e6f2ce8..41fc931ae 100644
--- a/mailman/pipeline/acknowledge.py
+++ b/mailman/pipeline/acknowledge.py
@@ -26,7 +26,6 @@ __all__ = ['Acknowledge']
 
 from zope.interface import implements
 
-from mailman import Errors
 from mailman import Message
 from mailman import Utils
 from mailman.configuration import config
diff --git a/mailman/pipeline/calculate_recipients.py b/mailman/pipeline/calculate_recipients.py
index a7e5f1521..f892435cd 100644
--- a/mailman/pipeline/calculate_recipients.py
+++ b/mailman/pipeline/calculate_recipients.py
@@ -28,10 +28,10 @@ __all__ = ['CalculateRecipients']
 
 from zope.interface import implements
 
-from mailman import Errors
 from mailman import Message
 from mailman import Utils
 from mailman.configuration import config
+from mailman.core import errors
 from mailman.i18n import _
 from mailman.interfaces import DeliveryStatus, IHandler
 
@@ -83,7 +83,7 @@ class CalculateRecipients:
 Your urgent message to the %(realname)s mailing list was not authorized for
 delivery.  The original message as received by Mailman is attached.
 """)
-                raise Errors.RejectMessage, Utils.wrap(text)
+                raise errors.RejectMessage, Utils.wrap(text)
         # Calculate the regular recipients of the message
         recips = set(member.address.address
                      for member in mlist.regular_members.members
diff --git a/mailman/pipeline/decorate.py b/mailman/pipeline/decorate.py
index a9f20f4d8..3e9c6360b 100644
--- a/mailman/pipeline/decorate.py
+++ b/mailman/pipeline/decorate.py
@@ -28,7 +28,6 @@ from email.MIMEText import MIMEText
 from string import Template
 from zope.interface import implements
 
-from mailman import Errors
 from mailman import Utils
 from mailman.Message import Message
 from mailman.configuration import config
diff --git a/mailman/pipeline/file_recipients.py b/mailman/pipeline/file_recipients.py
index 3ca13b6e1..5f47059d3 100644
--- a/mailman/pipeline/file_recipients.py
+++ b/mailman/pipeline/file_recipients.py
@@ -28,7 +28,6 @@ import errno
 
 from zope.interface import implements
 
-from mailman import Errors
 from mailman.i18n import _
 from mailman.interfaces import IHandler
 
diff --git a/mailman/pipeline/mime_delete.py b/mailman/pipeline/mime_delete.py
index bfcdd39a9..9cb34297f 100644
--- a/mailman/pipeline/mime_delete.py
+++ b/mailman/pipeline/mime_delete.py
@@ -37,14 +37,14 @@ from email.Iterators import typed_subpart_iterator
 from os.path import splitext
 from zope.interface import implements
 
-from mailman import Errors
 from mailman.Message import UserNotification
 from mailman.Utils import oneline
-from mailman.version import VERSION
 from mailman.configuration import config
+from mailman.core import errors
 from mailman.i18n import _
 from mailman.interfaces import IHandler
 from mailman.queue import Switchboard
+from mailman.version import VERSION
 
 log = logging.getLogger('mailman.error')
 
@@ -231,7 +231,7 @@ def dispose(mlist, msg, msgdata, why):
     # filter_action == 0 just discards, see below
     if mlist.filter_action == 1:
         # Bounce the message to the original author
-        raise Errors.RejectMessage, why
+        raise errors.RejectMessage, why
     if mlist.filter_action == 2:
         # Forward it on to the list owner
         listname = mlist.internal_name()
@@ -249,7 +249,7 @@ are receiving the only remaining copy of the discarded message.
         badq = Switchboard(config.BADQUEUE_DIR)
         badq.enqueue(msg, msgdata)
     # Most cases also discard the message
-    raise Errors.DiscardMessage
+    raise errors.DiscardMessage
 
 def get_file_ext(m):
     """
diff --git a/mailman/pipeline/moderate.py b/mailman/pipeline/moderate.py
index 0463a5e9b..11471dd3a 100644
--- a/mailman/pipeline/moderate.py
+++ b/mailman/pipeline/moderate.py
@@ -22,10 +22,10 @@ import re
 from email.MIMEMessage import MIMEMessage
 from email.MIMEText import MIMEText
 
-from mailman import Errors
 from mailman import Message
 from mailman import Utils
 from mailman.configuration import config
+from mailman.core import errors
 from mailman.i18n import _
 
 
@@ -72,11 +72,11 @@ def process(mlist, msg, msgdata):
                 else:
                     # Use the default RejectMessage notice string
                     text = None
-                raise Errors.RejectMessage, text
+                raise errors.RejectMessage, text
             elif mlist.member_moderation_action == 2:
                 # Discard.  BAW: Again, it would be nice if we could send a
                 # discard notice to the sender
-                raise Errors.DiscardMessage
+                raise errors.DiscardMessage
             else:
                 assert 0, 'bad member_moderation_action'
         # Should we do anything explict to mark this message as getting past
@@ -135,10 +135,10 @@ def matches_p(sender, nonmembers):
 def do_reject(mlist):
     listowner = mlist.GetOwnerEmail()
     if mlist.nonmember_rejection_notice:
-        raise Errors.RejectMessage, \
+        raise errors.RejectMessage, \
               Utils.wrap(_(mlist.nonmember_rejection_notice))
     else:
-        raise Errors.RejectMessage, Utils.wrap(_("""\
+        raise errors.RejectMessage, Utils.wrap(_("""\
 You are not allowed to post to this mailing list, and your message has been
 automatically rejected.  If you think that your messages are being rejected in
 error, contact the mailing list owner at %(listowner)s."""))
@@ -164,4 +164,4 @@ def do_discard(mlist, msg):
         nmsg.attach(MIMEMessage(msg))
         nmsg.send(mlist)
     # Discard this sucker
-    raise Errors.DiscardMessage
+    raise errors.DiscardMessage
diff --git a/mailman/pipeline/scrubber.py b/mailman/pipeline/scrubber.py
index f6187a1cd..a538de1e9 100644
--- a/mailman/pipeline/scrubber.py
+++ b/mailman/pipeline/scrubber.py
@@ -39,9 +39,9 @@ from mimetypes import guess_all_extensions
 from zope.interface import implements
 
 from mailman import Utils
-from mailman.Errors import DiscardMessage
 from mailman.app.plugins import get_plugin
 from mailman.configuration import config
+from mailman.core.errors import DiscardMessage
 from mailman.i18n import _
 from mailman.interfaces import IHandler
 
diff --git a/mailman/pipeline/smtp_direct.py b/mailman/pipeline/smtp_direct.py
index 447c61c8b..7d9242417 100644
--- a/mailman/pipeline/smtp_direct.py
+++ b/mailman/pipeline/smtp_direct.py
@@ -43,9 +43,9 @@ from email.Header import Header
 from email.Utils import formataddr
 from zope.interface import implements
 
-from mailman import Errors
 from mailman import Utils
 from mailman.configuration import config
+from mailman.core import errors
 from mailman.i18n import _
 from mailman.interfaces import IHandler, Personalization
 
@@ -254,7 +254,7 @@ def process(mlist, msg, msgdata):
             failure_log.info('%s', template.safe_substitute(substitutions))
     # Return the results
     if tempfailures or permfailures:
-        raise Errors.SomeRecipientsFailed(tempfailures, permfailures)
+        raise errors.SomeRecipientsFailed(tempfailures, permfailures)
 
 
 
diff --git a/mailman/pipeline/to_digest.py b/mailman/pipeline/to_digest.py
index d8d4ac669..7c868fe74 100644
--- a/mailman/pipeline/to_digest.py
+++ b/mailman/pipeline/to_digest.py
@@ -48,16 +48,16 @@ from email.parser import Parser
 from email.utils import formatdate, getaddresses, make_msgid
 from zope.interface import implements
 
-from mailman import Errors
 from mailman import Message
 from mailman import Utils
 from mailman import i18n
 from mailman.Mailbox import Mailbox
 from mailman.Mailbox import Mailbox
 from mailman.configuration import config
+from mailman.core import errors
+from mailman.interfaces import DeliveryMode, DeliveryStatus, IHandler
 from mailman.pipeline.decorate import decorate
 from mailman.pipeline.scrubber import process as scrubber
-from mailman.interfaces import DeliveryMode, DeliveryStatus, IHandler
 from mailman.queue import Switchboard
 
 
@@ -321,7 +321,7 @@ def send_i18n_digests(mlist, mboxfp):
         # Use Mailman.pipeline.scrubber.process() to get plain text
         try:
             msg = scrubber(mlist, msg)
-        except Errors.DiscardMessage:
+        except errors.DiscardMessage:
             print >> plainmsg, _('[Message discarded by content filter]')
             continue
         # Honor the default setting