Merge the Pipermail eradication branch. The scrubber is also removed.

 * Configuration variable `[mailman]filtered_messages_are_preservable`
   controls whether messages which have their top-level `Content-Type`
   filtered out can be preserved in the `bad` queue by list owners.
 * Configuration section `[scrubber]` removed, as is the scrubber handler.
   This handler was essentially incompatible with Mailman 3 since it required
   coordination with Pipermail to store attachments on disk.

 * Schema additions:
   - mailinglist.filter_action

2 files changed, 0 insertions, 46 deletions

diff --git a/src/mailman/commands/docs/info.rst b/src/mailman/commands/docs/info.rst
index ad034a1a6..7f69eada5 100644
--- a/src/mailman/commands/docs/info.rst
+++ b/src/mailman/commands/docs/info.rst
@@ -70,8 +70,6 @@ The File System Hierarchy layout is the same every by definition.
         LOG_DIR                  = /var/log/mailman
         MESSAGES_DIR             = /var/lib/mailman/messages
         PID_FILE                 = /var/run/mailman/master.pid
-        PRIVATE_ARCHIVE_FILE_DIR = /var/lib/mailman/archives/private
-        PUBLIC_ARCHIVE_FILE_DIR  = /var/lib/mailman/archives/public
         QUEUE_DIR                = /var/spool/mailman
         TEMPLATE_DIR             = .../mailman/templates
         VAR_DIR                  = /var/lib/mailman
diff --git a/src/mailman/commands/docs/remove.rst b/src/mailman/commands/docs/remove.rst
index f0f4e64f6..35dc53c5e 100644
--- a/src/mailman/commands/docs/remove.rst
+++ b/src/mailman/commands/docs/remove.rst
@@ -24,7 +24,6 @@ A system administrator can remove mailing lists by the command line.
     >>> command = Remove()
     >>> command.process(args)
     Removed list: test@example.com
-    Not removing archives.  Reinvoke with -a to remove them.
 
     >>> print list_manager.get('test@example.com')
     None
@@ -40,46 +39,3 @@ You can also remove lists quietly.
 
     >>> print list_manager.get('test@example.com')
     None
-
-
-Removing archives
-=================
-
-By default 'mailman remove' does not remove a mailing list's archives.
-::
-
-    >>> create_list('test@example.com')
-    <mailing list "test@example.com" at ...>
-
-    # Fake an mbox file for the mailing list.
-    >>> import os
-    >>> def make_mbox(fqdn_listname):
-    ...     mbox_dir = os.path.join(
-    ...         config.PUBLIC_ARCHIVE_FILE_DIR, fqdn_listname + '.mbox')
-    ...     os.makedirs(mbox_dir)
-    ...     mbox_file = os.path.join(mbox_dir, fqdn_listname + '.mbox')
-    ...     with open(mbox_file, 'w') as fp:
-    ...         print >> fp, 'A message'
-    ...     assert os.path.exists(mbox_file)
-    ...     return mbox_file
-
-    >>> mbox_file = make_mbox('test@example.com')
-    >>> args.quiet = False
-    >>> command.process(args)
-    Removed list: test@example.com
-    Not removing archives.  Reinvoke with -a to remove them.
-
-    >>> os.path.exists(mbox_file)
-    True
-
-Even if the mailing list has been deleted, you can still delete the archives
-afterward.
-::
-
-    >>> args.archives = True
-    
-    >>> command.process(args)
-    No such list: test@example.com; removing residual archives.
-
-    >>> os.path.exists(mbox_file)
-    False