diff options
Diffstat (limited to 'mailman/pipeline')
| -rw-r--r-- | mailman/pipeline/cook_headers.py | 9 | ||||
| -rw-r--r-- | mailman/pipeline/scrubber.py | 4 | ||||
| -rw-r--r-- | mailman/pipeline/to_digest.py | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/mailman/pipeline/cook_headers.py b/mailman/pipeline/cook_headers.py index c5e21da5f..2cf156b2c 100644 --- a/mailman/pipeline/cook_headers.py +++ b/mailman/pipeline/cook_headers.py @@ -31,10 +31,11 @@ from zope.interface import implements from mailman import Utils from mailman import Version -from mailman.app.archiving import get_archiver from mailman.configuration import config from mailman.i18n import _ from mailman.interfaces import IHandler, Personalization, ReplyToMunging +from mailman.app.archiving import get_primary_archiver + CONTINUATION = ',\n\t' COMMASPACE = ', ' @@ -205,7 +206,7 @@ def process(mlist, msg, msgdata): 'List-Unsubscribe': subfieldfmt % (listinfo, mlist.leave_address), 'List-Subscribe' : subfieldfmt % (listinfo, mlist.join_address), }) - archiver = get_archiver() + archiver = get_primary_archiver(mlist) if msgdata.get('reduced_list_headers'): headers['X-List-Administrivia'] = 'yes' else: @@ -214,7 +215,7 @@ def process(mlist, msg, msgdata): headers['List-Post'] = '<mailto:%s>' % mlist.posting_address # Add this header if we're archiving if mlist.archive: - archiveurl = archiver.get_list_url(mlist) + archiveurl = archiver.get_list_url() headers['List-Archive'] = '<%s>' % archiveurl # XXX RFC 2369 also defines a List-Owner header which we are not currently # supporting, but should. @@ -222,7 +223,7 @@ def process(mlist, msg, msgdata): # Draft RFC 5064 defines an Archived-At header which contains the pointer # directly to the message in the archive. If the currently defined # archiver can tell us the URL, go ahead and include this header. - archived_at = archiver.get_message_url(mlist, msg) + archived_at = archiver.get_message_url(msg) if archived_at is not None: headers['Archived-At'] = archived_at # First we delete any pre-existing headers because the RFC permits only diff --git a/mailman/pipeline/scrubber.py b/mailman/pipeline/scrubber.py index 37a5c7873..394fe6322 100644 --- a/mailman/pipeline/scrubber.py +++ b/mailman/pipeline/scrubber.py @@ -40,7 +40,7 @@ from zope.interface import implements from mailman import Utils from mailman.Errors import DiscardMessage -from mailman.app.archiving import get_archiver +from mailman.app.archiving import get_primary_archiver from mailman.configuration import config from mailman.i18n import _ from mailman.interfaces import IHandler @@ -497,7 +497,7 @@ def save_attachment(mlist, msg, dir, filter_html=True): fp.write(decodedpayload) fp.close() # Now calculate the url to the list's archive. - baseurl = get_archiver().get_list_url(mlist) + baseurl = get_primary_archiver().get_list_url(mlist) if not baseurl.endswith('/'): baseurl += '/' # Trailing space will definitely be a problem with format=flowed. diff --git a/mailman/pipeline/to_digest.py b/mailman/pipeline/to_digest.py index 05b1dc3d5..628fea65d 100644 --- a/mailman/pipeline/to_digest.py +++ b/mailman/pipeline/to_digest.py @@ -347,7 +347,7 @@ def send_i18n_digests(mlist, mboxfp): print >> plainmsg # Now add the footer if mlist.digest_footer: - footertxt = decorate(mlist, mlist.digest_footer, _('digest footer')) + footertxt = decorate(mlist, mlist.digest_footer) # MIME footer = MIMEText(footertxt.encode(lcset), _charset=lcset) footer['Content-Description'] = _('Digest Footer') |