diff options
Diffstat (limited to 'src/mailman/pipeline')
| -rw-r--r-- | src/mailman/pipeline/docs/rfc-2369.rst | 28 | ||||
| -rw-r--r-- | src/mailman/pipeline/scrubber.py | 13 |
2 files changed, 10 insertions, 31 deletions
diff --git a/src/mailman/pipeline/docs/rfc-2369.rst b/src/mailman/pipeline/docs/rfc-2369.rst index a1ba6c746..1b89f2354 100644 --- a/src/mailman/pipeline/docs/rfc-2369.rst +++ b/src/mailman/pipeline/docs/rfc-2369.rst @@ -148,35 +148,11 @@ header will be added. >>> mlist.archive = True - >>> from mailman.config import config - >>> config.push('pipermail', """ - ... [archiver.prototype] - ... enable: no - ... [archiver.mail_archive] - ... enable: no - ... [archiver.mhonarc] - ... enable: no - ... [archiver.pipermail] - ... enable: yes - ... """) - - >>> msg = message_from_string("""\ - ... From: aperson@example.com - ... - ... """) - >>> process(mlist, msg, {}) - >>> list_headers(msg, only='list-archive') - ---start--- - list-archive: <http://www.example.com/pipermail/test@example.com> - ---end--- - `RFC 5064`_ defines the `Archived-At` header which contains the url to the individual message in the archives. Archivers which don't support -pre-calculation of the archive url cannot add the `Archived-At` header, as is -the case with Pipermail (see above). However, other archivers can calculate -the url, and do add this header. +pre-calculation of the archive url cannot add the `Archived-At` header. +However, other archivers can calculate the url, and do add this header. - >>> config.pop('pipermail') >>> config.push('prototype', """ ... [archiver.prototype] ... enable: yes diff --git a/src/mailman/pipeline/scrubber.py b/src/mailman/pipeline/scrubber.py index 0584c0a2c..76d10427e 100644 --- a/src/mailman/pipeline/scrubber.py +++ b/src/mailman/pipeline/scrubber.py @@ -175,8 +175,7 @@ def process(mlist, msg, msgdata=None): # # Also get the RFC 3676 stuff from this part. This seems to # work okay for scrub_nondigest. It will also work as far as - # scrubbing messages for the archive is concerned, but Pipermail - # doesn't pay any attention to the RFC 3676 parameters. The plain + # scrubbing messages for the archive is concerned. The plain # format digest is going to be a disaster in any case as some of # messages will be format="flowed" and some not. ToDigest creates # its own Content-Type: header for the plain digest which won't @@ -209,7 +208,9 @@ URL: $url # sets content-type to text/plain lcset) elif sanitize == 2: - # By leaving it alone, Pipermail will automatically escape it + # By leaving it alone, Pipermail will automatically escape it. + # XXX 2012-03-13 BAW: Now that Pipermail has been removed, do + # we even need this? pass elif sanitize == 3: # Pull it out as an attachment but leave it unescaped. This @@ -259,8 +260,7 @@ Size: $size URL: $url """), lcset) # If the message isn't a multipart, then we'll strip it out as an - # attachment that would have to be separately downloaded. Pipermail - # will transform the url into a hyperlink. + # attachment that would have to be separately downloaded. elif part._payload and not part.is_multipart(): payload = part.get_payload(decode=True) ctype = part.get_content_type() @@ -290,6 +290,9 @@ URL: $url # We still have to sanitize multipart messages to flat text because # Pipermail can't handle messages with list payloads. This is a kludge; # def (n) clever hack ;). + # + # XXX 2012-03-13 BAW: Now that Pipermail has been removed, do we even need + # this code? if msg.is_multipart() and sanitize != 2: # By default we take the charset of the first text/plain part in the # message, but if there was none, we'll use the list's preferred |