aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkikuchi <>2005-07-13 06:31:01 +0000
committertkikuchi <>2005-07-13 06:31:01 +0000
commit3bbe434df3cdeae0585bd481334e52a154ade229 (patch)
tree4a4805ade996790c16cb56d0199bd592235681d2
parent78718e09757c75ae58452883a449f58ee8da5929 (diff)
downloadmailman2-3bbe434df3cdeae0585bd481334e52a154ade229.tar.gz
mailman2-3bbe434df3cdeae0585bd481334e52a154ade229.tar.xz
mailman2-3bbe434df3cdeae0585bd481334e52a154ade229.zip
A part can be None type in Python2.4 if multipart/mixed without real content.
Temporary work around to ignore such case.
-rw-r--r--Mailman/Handlers/Scrubber.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py
index 24bb575f..564d4f1a 100644
--- a/Mailman/Handlers/Scrubber.py
+++ b/Mailman/Handlers/Scrubber.py
@@ -284,6 +284,9 @@ Url: %(url)s
# will transform the url into a hyperlink.
elif part and not part.is_multipart():
payload = part.get_payload(decode=True)
+ if type(payload) <> StringType:
+ # What other type can this be ? Skip this.
+ continue
ctype = part.get_type()
# XXX Under email 2.5, it is possible that payload will be None.
# This can happen when you have a Content-Type: multipart/* with