diff options
author | Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp> | 2007-11-19 09:06:10 +0900 |
---|---|---|
committer | Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp> | 2007-11-19 09:06:10 +0900 |
commit | 2d7babef109e595bfa4e945cf31d63817408746e (patch) | |
tree | 024961e035bf84241e1cbf5ec09e0ea211953baa /Mailman/Handlers/Scrubber.py | |
parent | 4683bd064689820562fdd31d6522045c5be33c55 (diff) | |
parent | 588890f16d73b3497ee86ae2ed2176de1190da6c (diff) | |
download | mailman2-2d7babef109e595bfa4e945cf31d63817408746e.tar.gz mailman2-2d7babef109e595bfa4e945cf31d63817408746e.tar.xz mailman2-2d7babef109e595bfa4e945cf31d63817408746e.zip |
merge from launchpad
Diffstat (limited to '')
-rw-r--r-- | Mailman/Handlers/Scrubber.py | 4 |
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() |