summaryrefslogtreecommitdiff
path: root/src/mailman/runners
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/runners')
-rw-r--r--src/mailman/runners/digest.py7
-rw-r--r--src/mailman/runners/docs/digester.rst6
2 files changed, 0 insertions, 13 deletions
diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py
index 2730fc427..5ad82c469 100644
--- a/src/mailman/runners/digest.py
+++ b/src/mailman/runners/digest.py
@@ -46,7 +46,6 @@ from mailman.core.i18n import _
from mailman.core.runner import Runner
from mailman.interfaces.member import DeliveryMode, DeliveryStatus
from mailman.pipeline.decorate import decorate
-from mailman.pipeline.scrubber import process as scrubber
from mailman.utilities.i18n import make
from mailman.utilities.mailbox import Mailbox
from mailman.utilities.string import oneline, wrap
@@ -253,12 +252,6 @@ class RFC1153Digester(Digester):
if count > 1:
print >> self._text, self._separator30
print >> self._text
- # Scrub attachements.
- try:
- msg = scrubber(self._mlist, msg)
- except DiscardMessage:
- print >> self._text, _('[Message discarded by content filter]')
- return
# Each message section contains a few headers.
for header in config.digests.plain_digest_keep_headers.split():
if header in msg:
diff --git a/src/mailman/runners/docs/digester.rst b/src/mailman/runners/docs/digester.rst
index 5a20db556..70c5cc587 100644
--- a/src/mailman/runners/docs/digester.rst
+++ b/src/mailman/runners/docs/digester.rst
@@ -223,7 +223,6 @@ The RFC 1153 contains the digest in a single plain text message.
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Test digest..."
<BLANKLINE>
- <BLANKLINE>
Today's Topics:
<BLANKLINE>
1. Test message 1 (aperson@example.com)
@@ -237,7 +236,6 @@ The RFC 1153 contains the digest in a single plain text message.
From: aperson@example.com
Subject: Test message 1
To: xtest@example.com
- Message-ID: ...
<BLANKLINE>
Here is message 1
<BLANKLINE>
@@ -246,7 +244,6 @@ The RFC 1153 contains the digest in a single plain text message.
From: aperson@example.com
Subject: Test message 2
To: xtest@example.com
- Message-ID: ...
<BLANKLINE>
Here is message 2
<BLANKLINE>
@@ -255,7 +252,6 @@ The RFC 1153 contains the digest in a single plain text message.
From: aperson@example.com
Subject: Test message 3
To: xtest@example.com
- Message-ID: ...
<BLANKLINE>
Here is message 3
<BLANKLINE>
@@ -264,7 +260,6 @@ The RFC 1153 contains the digest in a single plain text message.
From: aperson@example.com
Subject: Test message 4
To: xtest@example.com
- Message-ID: ...
<BLANKLINE>
Here is message 4
<BLANKLINE>
@@ -458,7 +453,6 @@ The content can be decoded to see the actual digest text.
"'From: aperson@example.org'",
"'Subject: \\xe4\\xb8\\x80\\xe7\\x95\\xaa'",
"'To: test@example.com'",
- "'Message-ID: ...
"'Content-Type: text/plain; charset=iso-2022-jp'",
"''",
"'\\xe4\\xb8\\x80\\xe7\\x95\\xaa'",