1 files changed, 35 insertions, 13 deletions

diff --git a/Mailman/Errors.py b/Mailman/Errors.py
index 07f0f2eb7..eb497a670 100644
--- a/Mailman/Errors.py
+++ b/Mailman/Errors.py
@@ -24,15 +24,6 @@ MMBadListError       = "MMBadListError"
 MMBadUserError       = "MMBadUserError"
 MMBadConfigError     = "MMBadConfigError"
 
-# Exception hierarchy for bad email address errors that can be raised from
-# Utils.ValidateEmail()
-class EmailAddressError(Exception):
-    pass
-class MMBadEmailError(EmailAddressError):
-    pass
-class MMHostileAddress(EmailAddressError):
-    pass
-
 # Exception hierarchy for various authentication failures, can be
 # raised from functions in SecurityManager.py
 class MMAuthenticationError(Exception): pass
@@ -54,10 +45,6 @@ MMAlreadyAMember     = "MMAlreadyAMember"
 MMAlreadyDigested    = "MMAlreadyDigested"
 MMAlreadyUndigested  = "MMAlreadyUndigested"
 
-class MMLoopingPost:
-    """Post already went through this list!"""
-    pass
-
 MODERATED_LIST_MSG    = "Moderated list"
 IMPLICIT_DEST_MSG     = "Implicit destination"
 SUSPICIOUS_HEADER_MSG = "Suspicious header"
@@ -85,3 +72,38 @@ Some useful fields are:
   <dd>The less brief list description.
 </dl>
 """
+
+
+
+# New style class based exceptions.  All the above errors should eventually be
+# converted.
+
+class MailmanError(Exception):
+    """Base class for all Mailman exceptions."""
+    pass
+
+
+class MMLoopingPost(MailmanError):
+    """Post already went through this list!"""
+    pass
+
+
+# Exception hierarchy for bad email address errors that can be raised from
+# Utils.ValidateEmail()
+class EmailAddressError(MailmanError):
+    """Base class for email address validation errors."""
+    pass
+
+class MMBadEmailError(EmailAddressError):
+    """Email address is invalid (empty string or not fully qualified)."""
+    pass
+
+class MMHostileAddress(EmailAddressError):
+    """Email address has potentially hostile characters in it."""
+    pass
+
+
+# Exceptions for admin request database
+class LostHeldMessage(MailmanError):
+    """Held message was lost."""
+    pass