diff options
Diffstat (limited to 'src/mailman/runners/digest.py')
| -rw-r--r-- | src/mailman/runners/digest.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py index 2730fc427..afc11f732 100644 --- a/src/mailman/runners/digest.py +++ b/src/mailman/runners/digest.py @@ -41,12 +41,10 @@ from email.utils import formatdate, getaddresses, make_msgid from urllib2 import URLError from mailman.config import config -from mailman.core.errors import DiscardMessage from mailman.core.i18n import _ from mailman.core.runner import Runner +from mailman.handlers.decorate import decorate from mailman.interfaces.member import DeliveryMode, DeliveryStatus -from mailman.pipeline.decorate import decorate -from mailman.pipeline.scrubber import process as scrubber from mailman.utilities.i18n import make from mailman.utilities.mailbox import Mailbox from mailman.utilities.string import oneline, wrap @@ -63,9 +61,8 @@ class Digester: self._mlist = mlist self._charset = mlist.preferred_language.charset # This will be used in the Subject, so use $-strings. - realname = mlist.real_name - issue = digest_number - self._digest_id = _('$realname Digest, Vol $volume, Issue $issue') + self._digest_id = _( + '$mlist.display_name Digest, Vol $volume, Issue $digest_number') self._subject = Header(self._digest_id, self._charset, header_name='Subject') @@ -83,7 +80,7 @@ class Digester: # ahead and add it now. self._masthead = make('masthead.txt', mailing_list=mlist, - real_name=mlist.real_name, + display_name=mlist.display_name, got_list_email=mlist.posting_address, got_listinfo_url=mlist.script_url('listinfo'), got_request_email=mlist.request_address, @@ -253,12 +250,6 @@ class RFC1153Digester(Digester): if count > 1: print >> self._text, self._separator30 print >> self._text - # Scrub attachements. - try: - msg = scrubber(self._mlist, msg) - except DiscardMessage: - print >> self._text, _('[Message discarded by content filter]') - return # Each message section contains a few headers. for header in config.digests.plain_digest_keep_headers.split(): if header in msg: |