summaryrefslogtreecommitdiff
path: root/mailman/pipeline/mime_delete.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/mime_delete.py
parent6f4351721559e8b7b577d3a01216fec88121ed11 (diff)
downloadmailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.tar.gz
mailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.tar.zst
mailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.zip
Diffstat (limited to 'mailman/pipeline/mime_delete.py')
-rw-r--r--mailman/pipeline/mime_delete.py8
1 files changed, 4 insertions, 4 deletions
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):
"""