3 files changed, 14 insertions, 19 deletions

diff --git a/mailman/pipeline/cook_headers.py b/mailman/pipeline/cook_headers.py
index c237c171a..4cda42c81 100644
--- a/mailman/pipeline/cook_headers.py
+++ b/mailman/pipeline/cook_headers.py
@@ -30,7 +30,7 @@ from email.Utils import parseaddr, formataddr, getaddresses
 from zope.interface import implements
 
 from mailman import Utils
-from mailman.app.archiving import get_primary_archiver
+from mailman.app.plugins import get_plugins
 from mailman.configuration import config
 from mailman.i18n import _
 from mailman.interfaces import IHandler, Personalization, ReplyToMunging
@@ -206,29 +206,24 @@ def process(mlist, msg, msgdata):
         'List-Unsubscribe': subfieldfmt % (listinfo, mlist.leave_address),
         'List-Subscribe'  : subfieldfmt % (listinfo, mlist.join_address),
         })
-    archiver = get_primary_archiver(mlist)
     if msgdata.get('reduced_list_headers'):
         headers['X-List-Administrivia'] = 'yes'
     else:
         # List-Post: is controlled by a separate attribute
         if mlist.include_list_post_header:
             headers['List-Post'] = '<mailto:%s>' % mlist.posting_address
-        # Add this header if we're archiving
+        # Add RFC 2369 and 5064 archiving headers, if archiving is enabled.
         if mlist.archive:
-            archiveurl = archiver.get_list_url()
-            headers['List-Archive'] = '<%s>' % archiveurl
+            for archiver in get_plugins('mailman.archiver'):
+                headers['List-Archive'] = '<%s>' % archiver.list_url(mlist)
+                permalink = archiver.permalink(mlist, msg)
+                if permalink is not None:
+                    headers['Archived-At'] = permalink
     # XXX RFC 2369 also defines a List-Owner header which we are not currently
     # supporting, but should.
-    #
-    # 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(msg)
-    if archived_at is not None:
-        headers['Archived-At'] = archived_at
-    # First we delete any pre-existing headers because the RFC permits only
-    # one copy of each, and we want to be sure it's ours.
     for h, v in headers.items():
+        # First we delete any pre-existing headers because the RFC permits
+        # only one copy of each, and we want to be sure it's ours.
         del msg[h]
         # Wrap these lines if they are too long.  78 character width probably
         # shouldn't be hardcoded, but is at least text-MUA friendly.  The
diff --git a/mailman/pipeline/docs/archives.txt b/mailman/pipeline/docs/archives.txt
index b7b54f17f..67ad45c89 100644
--- a/mailman/pipeline/docs/archives.txt
+++ b/mailman/pipeline/docs/archives.txt
@@ -7,11 +7,11 @@ delivery processes while messages are archived.  This also allows external
 archivers to work in a separate process from the main Mailman delivery
 processes.
 
-    >>> from mailman.queue import Switchboard
+    >>> from mailman.app.lifecycle import create_list
     >>> from mailman.configuration import config
+    >>> from mailman.queue import Switchboard
     >>> handler = config.handlers['to-archive']
-    >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
-    >>> mlist.preferred_language = u'en'
+    >>> mlist = create_list(u'_xtest@example.com')
     >>> switchboard = Switchboard(config.ARCHQUEUE_DIR)
 
 A helper function.
diff --git a/mailman/pipeline/scrubber.py b/mailman/pipeline/scrubber.py
index ca1fa37e0..bf6effd3a 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_primary_archiver
+from mailman.app.plugins import get_plugin
 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_primary_archiver(mlist).get_list_url()
+    baseurl = get_plugin('mailman.scrubber').list_url(mlist)
     if not baseurl.endswith('/'):
         baseurl += '/'
     # Trailing space will definitely be a problem with format=flowed.