diff options
| author | msapiro | 2006-02-19 21:03:59 +0000 |
|---|---|---|
| committer | msapiro | 2006-02-19 21:03:59 +0000 |
| commit | 1b2c29e31c47c522c7bed4ba645a4e9a39cdf378 (patch) | |
| tree | 5198c3fc53db86a2e6eda9ec71bc37f7704cc365 | |
| parent | 450aa924ec1d584014352c931bb35ef0c5b7e77a (diff) | |
| download | mailman-1b2c29e31c47c522c7bed4ba645a4e9a39cdf378.tar.gz mailman-1b2c29e31c47c522c7bed4ba645a4e9a39cdf378.tar.zst mailman-1b2c29e31c47c522c7bed4ba645a4e9a39cdf378.zip | |
| -rw-r--r-- | Mailman/Handlers/Scrubber.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py index 712280a70..4a4a3c59e 100644 --- a/Mailman/Handlers/Scrubber.py +++ b/Mailman/Handlers/Scrubber.py @@ -343,7 +343,12 @@ Url : %(url)s continue try: t = part.get_payload(decode=True) - except binascii.Error: + # MAS: TypeError exception can occur if payload is None. This + # was observed with a message that contained an attached + # message/delivery-status part. Because of the special parsing + # of this type, this resulted in a text/plain sub-part with a + # null body. See bug 1430236. + except (binascii.Error, TypeError): t = part.get_payload() # TK: get_content_charset() returns 'iso-2022-jp' for internally # crafted (scrubbed) 'euc-jp' text part. So, first try |