diff options
Diffstat (limited to 'Mailman/Handlers')
| -rw-r--r-- | Mailman/Handlers/Hold.py | 8 | ||||
| -rw-r--r-- | Mailman/Handlers/Scrubber.py | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py index 2e6eeb4ad..f53c168c5 100644 --- a/Mailman/Handlers/Hold.py +++ b/Mailman/Handlers/Hold.py @@ -99,11 +99,12 @@ word `help' in it to the request address, $request, for further instructions.""") class SuspiciousHeaders(Errors.HoldMessage): - reason = _('Message has a suspicious header') - rejection = _('Your message had a suspicious header.') + reason = _('Message has a suspicious header') + rejection = _('Your message had a suspicious header.') class MessageTooBig(Errors.HoldMessage): def __init__(self, msgsize, limit): + Errors.HoldMessage.__init__(self) self.__msgsize = msgsize self.__limit = limit @@ -253,8 +254,7 @@ def hold_for_approval(mlist, msg, msgdata, exc): # # This message should appear to come from <list>-admin so as to handle any # bounce processing that might be needed. - pendable = HeldMessagePendable(type=HeldMessagePendable.PEND_KEY, - id=str(id)) + pendable = HeldMessagePendable(type=HeldMessagePendable.PEND_KEY, id=id) token = config.db.pendings.add(pendable) # Get the language to send the response in. If the sender is a member, # then send it in the member's language, otherwise send it in the mailing diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py index 2acec6caa..6946de7f4 100644 --- a/Mailman/Handlers/Scrubber.py +++ b/Mailman/Handlers/Scrubber.py @@ -26,17 +26,13 @@ import time import errno import logging import binascii -import tempfile -from cStringIO import StringIO from email.charset import Charset from email.generator import Generator -from email.parser import HeaderParser from email.utils import make_msgid, parsedate from locknix.lockfile import Lock from mimetypes import guess_all_extensions -from Mailman import Message from Mailman import Utils from Mailman.Errors import DiscardMessage from Mailman.app.archiving import get_base_archive_url |