summaryrefslogtreecommitdiff
path: root/src/mailman/handlers/mime_delete.py
diff options
context:
space:
mode:
authorBarry Warsaw2016-04-30 13:34:04 -0400
committerGitLab2016-04-30 19:54:54 +0000
commitc6eb7ee3e574b48ee016dd31af2014b0ed083268 (patch)
tree14c1f1e7bb382898ee50909333365aab335aa4a1 /src/mailman/handlers/mime_delete.py
parent465f24ff33e154385322ee894d32d8b7dd9b3941 (diff)
downloadmailman-c6eb7ee3e574b48ee016dd31af2014b0ed083268.tar.gz
mailman-c6eb7ee3e574b48ee016dd31af2014b0ed083268.tar.zst
mailman-c6eb7ee3e574b48ee016dd31af2014b0ed083268.zip
Diffstat (limited to 'src/mailman/handlers/mime_delete.py')
-rw-r--r--src/mailman/handlers/mime_delete.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mailman/handlers/mime_delete.py b/src/mailman/handlers/mime_delete.py
index 267cb227a..b88c40b0c 100644
--- a/src/mailman/handlers/mime_delete.py
+++ b/src/mailman/handlers/mime_delete.py
@@ -30,7 +30,7 @@ import logging
import tempfile
import subprocess
-from contextlib import ExitStack
+from contextlib import ExitStack, suppress
from email.iterators import typed_subpart_iterator
from email.mime.message import MIMEMessage
from email.mime.text import MIMEText
@@ -220,11 +220,9 @@ def collapse_multipart_alternatives(msg):
newpayload = []
for subpart in msg.get_payload():
if subpart.get_content_type() == 'multipart/alternative':
- try:
+ with suppress(IndexError):
firstalt = subpart.get_payload(0)
newpayload.append(firstalt)
- except IndexError:
- pass
else:
newpayload.append(subpart)
msg.set_payload(newpayload)