summaryrefslogtreecommitdiff
path: root/mailman/pipeline/moderate.py
diff options
context:
space:
mode:
authorBarry Warsaw2008-09-26 21:11:51 -0400
committerBarry Warsaw2008-09-26 21:11:51 -0400
commitb6eff15e7d34e60e0fa9f13b5e944d73bf499414 (patch)
tree31dc0a415cf454740f1cb2c02b35a341889bb28c /mailman/pipeline/moderate.py
parent6f4351721559e8b7b577d3a01216fec88121ed11 (diff)
downloadmailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.tar.gz
mailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.tar.zst
mailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.zip
Diffstat (limited to 'mailman/pipeline/moderate.py')
-rw-r--r--mailman/pipeline/moderate.py12
1 files changed, 6 insertions, 6 deletions
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