aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2007-11-18 12:12:22 -0800
committerMark Sapiro <msapiro@value.net>2007-11-18 12:12:22 -0800
commit7ace1799d7935bede9b4821d8f8f4a9ca243bf08 (patch)
tree262e810b22f7ff45181b68f5f042f7d32c45d164
parentfa0b0e8852a31d6aa59651c7c92460c607a7337e (diff)
downloadmailman2-7ace1799d7935bede9b4821d8f8f4a9ca243bf08.tar.gz
mailman2-7ace1799d7935bede9b4821d8f8f4a9ca243bf08.tar.xz
mailman2-7ace1799d7935bede9b4821d8f8f4a9ca243bf08.zip
Scrubber.py - changed to use part.get_payload(), not part._payload.
Diffstat (limited to '')
-rw-r--r--Mailman/Handlers/Scrubber.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py
index 588dd9ac..1d5aed92 100644
--- a/Mailman/Handlers/Scrubber.py
+++ b/Mailman/Handlers/Scrubber.py
@@ -298,7 +298,7 @@ URL: %(url)s
# 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.
- elif part._payload and not part.is_multipart():
+ elif part.get_payload() and not part.is_multipart():
payload = part.get_payload(decode=True)
ctype = part.get_type()
# XXX Under email 2.5, it is possible that payload will be None.
@@ -350,7 +350,7 @@ URL: %(url)s
for part in msg.walk():
# TK: bug-id 1099138 and multipart
# MAS test payload - if part may fail if there are no headers.
- if not part._payload or part.is_multipart():
+ if not part.get_payload() or part.is_multipart():
continue
# All parts should be scrubbed to text/plain by now.
partctype = part.get_content_type()