Clean up the core directory.

mailman/core/errors.py is gone now.  We had a duplicate base exception
which now always comes from mailman/interfaces/errors.py.
Obsolete/unused exceptions are remove.  The other exceptions are moved
to better locations.

4 files changed, 13 insertions, 13 deletions

diff --git a/src/mailman/handlers/member_recipients.py b/src/mailman/handlers/member_recipients.py
index f224b4f36..6a28af11a 100644
--- a/src/mailman/handlers/member_recipients.py
+++ b/src/mailman/handlers/member_recipients.py
@@ -29,10 +29,10 @@ __all__ = [
 
 
 from mailman.config import config
-from mailman.core import errors
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.member import DeliveryStatus
+from mailman.interfaces.pipeline import RejectMessage
 from mailman.utilities.string import wrap
 from zope.interface import implementer
 
@@ -82,7 +82,7 @@ class MemberRecipients:
 Your urgent message to the $mlist.display_name mailing list was not authorized
 for delivery.  The original message as received by Mailman is attached.
 """)
-                raise errors.RejectMessage(wrap(text))
+                raise RejectMessage(wrap(text))
         # Calculate the regular recipients of the message
         recipients = set(member.address.email
                          for member in mlist.regular_members.members
diff --git a/src/mailman/handlers/mime_delete.py b/src/mailman/handlers/mime_delete.py
index 38495ebc9..a1e861bf8 100644
--- a/src/mailman/handlers/mime_delete.py
+++ b/src/mailman/handlers/mime_delete.py
@@ -42,11 +42,11 @@ from email.mime.text import MIMEText
 from itertools import count
 from lazr.config import as_boolean
 from mailman.config import config
-from mailman.core import errors
 from mailman.core.i18n import _
 from mailman.email.message import OwnerNotification
 from mailman.interfaces.action import FilterAction
 from mailman.interfaces.handler import IHandler
+from mailman.interfaces.pipeline import DiscardMessage, RejectMessage
 from mailman.utilities.string import oneline
 from mailman.version import VERSION
 from string import Template
@@ -60,7 +60,7 @@ log = logging.getLogger('mailman.error')
 def dispose(mlist, msg, msgdata, why):
     if mlist.filter_action is FilterAction.reject:
         # Bounce the message to the original author.
-        raise errors.RejectMessage(why)
+        raise RejectMessage(why)
     elif mlist.filter_action is FilterAction.forward:
         # Forward it on to the list moderators.
         text=_("""\
@@ -90,7 +90,7 @@ message.
             '{1} invalid FilterAction: {0}.  Treating as discard'.format(
                 mlist.fqdn_listname, mlist.filter_action.name))
     # Most cases also discard the message
-    raise errors.DiscardMessage(why)
+    raise DiscardMessage(why)
 
 
 
diff --git a/src/mailman/handlers/tests/test_filter.py b/src/mailman/handlers/tests/test_filter.py
index 141bd6c8d..0933d8b00 100644
--- a/src/mailman/handlers/tests/test_filter.py
+++ b/src/mailman/handlers/tests/test_filter.py
@@ -26,8 +26,8 @@ import unittest
 
 from mailman.app.lifecycle import create_list
 from mailman.config import config
-from mailman.core.errors import DiscardMessage
 from mailman.interfaces.mime import FilterAction
+from mailman.interfaces.pipeline import DiscardMessage
 from mailman.testing.helpers import specialized_message_from_string as mfs
 from mailman.testing.layers import ConfigLayer
 
diff --git a/src/mailman/handlers/tests/test_mimedel.py b/src/mailman/handlers/tests/test_mimedel.py
index d8829d995..d5670f1bc 100644
--- a/src/mailman/handlers/tests/test_mimedel.py
+++ b/src/mailman/handlers/tests/test_mimedel.py
@@ -33,10 +33,10 @@ import unittest
 from contextlib import ExitStack, contextmanager
 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.pipeline import DiscardMessage, RejectMessage
 from mailman.interfaces.usermanager import IUserManager
 from mailman.testing.helpers import (
     LogFileMark, configuration, get_queue_messages,
@@ -90,7 +90,7 @@ Message-ID: <ant>
 
     def test_dispose_discard(self):
         self._mlist.filter_action = FilterAction.discard
-        with self.assertRaises(errors.DiscardMessage) as cm:
+        with self.assertRaises(DiscardMessage) as cm:
             mime_delete.dispose(self._mlist, self._msg, {}, 'discarding')
         self.assertEqual(cm.exception.message, 'discarding')
         # There should be no messages in the 'bad' queue.
@@ -98,7 +98,7 @@ Message-ID: <ant>
 
     def test_dispose_bounce(self):
         self._mlist.filter_action = FilterAction.reject
-        with self.assertRaises(errors.RejectMessage) as cm:
+        with self.assertRaises(RejectMessage) as cm:
             mime_delete.dispose(self._mlist, self._msg, {}, 'rejecting')
         self.assertEqual(cm.exception.message, 'rejecting')
         # There should be no messages in the 'bad' queue.
@@ -114,7 +114,7 @@ Message-ID: <ant>
         self._mlist.subscribe(bart, MemberRole.moderator)
         # Now set the filter action and dispose the message.
         self._mlist.filter_action = FilterAction.forward
-        with self.assertRaises(errors.DiscardMessage) as cm:
+        with self.assertRaises(DiscardMessage) as cm:
             mime_delete.dispose(self._mlist, self._msg, {}, 'forwarding')
         self.assertEqual(cm.exception.message, 'forwarding')
         # There should now be a multipart message in the virgin queue destined
@@ -156,7 +156,7 @@ message.
         # the site owner has indicated that filtered messages cannot be
         # preserved, then this is the same as discarding them.
         self._mlist.filter_action = FilterAction.preserve
-        with self.assertRaises(errors.DiscardMessage) as cm:
+        with self.assertRaises(DiscardMessage) as cm:
             mime_delete.dispose(self._mlist, self._msg, {}, 'not preserved')
         self.assertEqual(cm.exception.message, 'not preserved')
         # There should be no messages in the 'bad' queue.
@@ -169,7 +169,7 @@ message.
         # preserved, then this is similar to discarding the message except
         # that a copy is preserved in the 'bad' queue.
         self._mlist.filter_action = FilterAction.preserve
-        with self.assertRaises(errors.DiscardMessage) as cm:
+        with self.assertRaises(DiscardMessage) as cm:
             mime_delete.dispose(self._mlist, self._msg, {}, 'preserved')
         self.assertEqual(cm.exception.message, 'preserved')
         # There should be no messages in the 'bad' queue.
@@ -189,7 +189,7 @@ message.
                        FilterAction.defer):
             self._mlist.filter_action = action
             mark = LogFileMark('mailman.error')
-            with self.assertRaises(errors.DiscardMessage) as cm:
+            with self.assertRaises(DiscardMessage) as cm:
                 mime_delete.dispose(self._mlist, self._msg, {}, 'bad action')
             self.assertEqual(cm.exception.message, 'bad action')
             line = mark.readline()[:-1]