diff options
| author | bwarsaw <> | 2005-12-30 18:50:08 +0000 |
|---|---|---|
| committer | bwarsaw <> | 2005-12-30 18:50:08 +0000 |
| commit | d44c2c9f011075a7f6b6ffebe22ec3f17dda3a26 (patch) | |
| tree | 6199ed049dba0f377f628b9c57a08b1ff9c3f500 /Mailman/Handlers/Scrubber.py | |
| parent | 11ba661517e7606f5f38a8be87f68b32bff0afd4 (diff) | |
| download | mailman2-d44c2c9f011075a7f6b6ffebe22ec3f17dda3a26.tar.gz mailman2-d44c2c9f011075a7f6b6ffebe22ec3f17dda3a26.tar.xz mailman2-d44c2c9f011075a7f6b6ffebe22ec3f17dda3a26.zip | |
A cleansing pass, almost entirely cosmetic. Such things as whitespace
normalization, removal of tabs, copyright year updates to changed files,
docstring and comment fixes, and usage of True/False. I also made a pass
through the NEWS file.
One import was reordered, and after this commit I will move the mmdsr.readme
file to README.mmdsr.
From my perspective, after that we're ready to go.
I will port these changes forward to the trunk.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Handlers/Scrubber.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py index edaa47d2..a0c4896c 100644 --- a/Mailman/Handlers/Scrubber.py +++ b/Mailman/Handlers/Scrubber.py @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Cleanse a message for archiving.""" @@ -162,9 +163,9 @@ def calculate_attachments_dir(mlist, msg, msgdata): def replace_payload_by_text(msg, text, charset): - # TK: This is a common function in replacing the attachment and - # the main message by a text (scrubbing). Plus a flag indicating - # it has been scrubbed. + # TK: This is a common function in replacing the attachment and the main + # message by a text (scrubbing). Also, add a flag indicating it has been + # scrubbed. del msg['content-type'] del msg['content-transfer-encoding'] msg.set_payload(text, charset) @@ -218,7 +219,7 @@ Url: %(url)s raise DiscardMessage replace_payload_by_text(part, _('HTML attachment scrubbed and removed'), - # Adding charset arg and removing content-tpe + # Adding charset arg and removing content-type # sets content-type to text/plain lcset) elif sanitize == 2: |