diff options
| author | Barry Warsaw | 2012-03-17 13:26:05 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2012-03-17 13:26:05 -0400 |
| commit | ae15984804096db593d83740dcd4c158626eb22f (patch) | |
| tree | 001465a291c829436cdbb1cc64d430342a1921bf | |
| parent | 8e6cca71e8b6b0e79394aaf2c1d13d7cfce41c29 (diff) | |
| download | mailman-ae15984804096db593d83740dcd4c158626eb22f.tar.gz mailman-ae15984804096db593d83740dcd4c158626eb22f.tar.zst mailman-ae15984804096db593d83740dcd4c158626eb22f.zip | |
Adjustments after landing the nopipermail branch.
| -rw-r--r-- | src/mailman/archiving/docs/common.rst | 14 | ||||
| -rw-r--r-- | src/mailman/pipeline/mime_delete.py | 3 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/mailman/archiving/docs/common.rst b/src/mailman/archiving/docs/common.rst index c5fecaefe..7437f4790 100644 --- a/src/mailman/archiving/docs/common.rst +++ b/src/mailman/archiving/docs/common.rst @@ -45,21 +45,9 @@ interoperate. Sending the message to the archiver =================================== -The archiver is also able to archive the message. -:: - - >>> archivers['pipermail'].archive_message(mlist, msg) - - >>> import os - >>> from mailman.interfaces.archiver import IPipermailMailingList - >>> pckpath = os.path.join( - ... IPipermailMailingList(mlist).archive_dir(), - ... 'pipermail.pck') - >>> os.path.exists(pckpath) - True - The `prototype` archiver archives messages to a maildir. + >>> import os >>> archivers['prototype'].archive_message(mlist, msg) >>> archive_path = os.path.join( ... config.ARCHIVE_DIR, 'prototype', mlist.fqdn_listname, 'new') diff --git a/src/mailman/pipeline/mime_delete.py b/src/mailman/pipeline/mime_delete.py index 99fdc3ede..c9c1eb408 100644 --- a/src/mailman/pipeline/mime_delete.py +++ b/src/mailman/pipeline/mime_delete.py @@ -64,9 +64,8 @@ def dispose(mlist, msg, msgdata, why): raise errors.RejectMessage(why) elif mlist.filter_action is FilterAction.forward: # Forward it on to the list moderators. - # FIXME 2012-03-16 BAW: Trunk uses .display_name text=_("""\ -The attached message matched the $mlist.real_name mailing list's content +The attached message matched the $mlist.display_name mailing list's content filtering rules and was prevented from being forwarded on to the list membership. You are receiving the only remaining copy of the discarded message. |