1 files changed, 10 insertions, 31 deletions

diff --git a/src/mailman/core/errors.py b/src/mailman/core/errors.py
index 8037ea823..2d31863c3 100644
--- a/src/mailman/core/errors.py
+++ b/src/mailman/core/errors.py
@@ -15,7 +15,16 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Mailman errors."""
+"""Legacy Mailman exceptions.
+
+This module is largely obsolete, though not all exceptions in use have been
+migrated to their proper location.  There are still a number of Mailman 2.1
+exceptions floating about in here too.
+
+The right place for exceptions is in the interface module for their related
+interfaces.
+"""
+
 
 from __future__ import absolute_import, unicode_literals
 
@@ -29,18 +38,14 @@ __all__ = [
     'EmailAddressError',
     'HandlerError',
     'HoldMessage',
-    'HostileSubscriptionError',
-    'InvalidEmailAddress',
     'LostHeldMessage',
     'MailmanError',
     'MailmanException',
     'MemberError',
-    'MembershipIsBanned',
     'MustDigestError',
     'NotAMemberError',
     'PasswordError',
     'RejectMessage',
-    'SubscriptionError',
     ]
 
 
@@ -58,7 +63,6 @@ class AlreadyReceivingDigests(MemberError): pass
 class AlreadyReceivingRegularDeliveries(MemberError): pass
 class CantDigestError(MemberError): pass
 class MustDigestError(MemberError): pass
-class MembershipIsBanned(MemberError): pass
 
 
 
@@ -71,17 +75,6 @@ class MailmanError(MailmanException):
 
 
 
-# Exception hierarchy for bad email address errors that can be raised from
-# mailman.email.validate.validate()
-class EmailAddressError(MailmanError):
-    """Base class for email address validation errors."""
-
-
-class InvalidEmailAddress(EmailAddressError):
-    """Email address is invalid."""
-
-
-
 # Exceptions for admin request database
 class LostHeldMessage(MailmanError):
     """Held message was lost."""
@@ -134,20 +127,6 @@ class RejectMessage(HandlerError):
 
 
 
-# Subscription exceptions
-class SubscriptionError(MailmanError):
-    """Subscription errors base class."""
-
-
-class HostileSubscriptionError(SubscriptionError):
-    """A cross-subscription attempt was made.
-
-    This exception gets raised when an invitee attempts to use the
-    invitation to cross-subscribe to some other mailing list.
-    """
-
-
-
 class PasswordError(MailmanError):
     """A password related error."""