summaryrefslogtreecommitdiff
path: root/src/mailman/handlers/mime_delete.py
diff options
context:
space:
mode:
authorMark Sapiro2017-06-15 15:17:41 -0700
committerMark Sapiro2017-06-15 15:20:46 -0700
commit249f47b3c947c4a64c5d0cca949e70f20a4d3644 (patch)
tree7e7690586846d5a4d62040d6433ac6fc7562f77a /src/mailman/handlers/mime_delete.py
parent522c0a73d70cb1aa76881376705c7384759580a9 (diff)
downloadmailman-249f47b3c947c4a64c5d0cca949e70f20a4d3644.tar.gz
mailman-249f47b3c947c4a64c5d0cca949e70f20a4d3644.tar.zst
mailman-249f47b3c947c4a64c5d0cca949e70f20a4d3644.zip
Diffstat (limited to 'src/mailman/handlers/mime_delete.py')
-rw-r--r--src/mailman/handlers/mime_delete.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mailman/handlers/mime_delete.py b/src/mailman/handlers/mime_delete.py
index 4f1b08ac7..662c773ae 100644
--- a/src/mailman/handlers/mime_delete.py
+++ b/src/mailman/handlers/mime_delete.py
@@ -28,7 +28,6 @@ import os
import shutil
import logging
import tempfile
-import subprocess
from contextlib import ExitStack, suppress
from email.iterators import typed_subpart_iterator
@@ -46,6 +45,7 @@ from mailman.utilities.string import oneline
from mailman.version import VERSION
from public import public
from string import Template
+from subprocess import CalledProcessError, check_output
from zope.interface import implementer
@@ -277,12 +277,8 @@ def to_plaintext(msg):
template = Template(config.mailman.html_to_plain_text_command)
command = template.safe_substitute(filename=filename).split()
try:
- stdout = subprocess.check_output(
- command, universal_newlines=True)
- except (FileNotFoundError,
- PermissionError,
- subprocess.CalledProcessError,
- ):
+ stdout = check_output(command, universal_newlines=True)
+ except (CalledProcessError, FileNotFoundError, PermissionError):
log.exception('HTML -> text/plain command error')
else:
# Replace the payload of the subpart with the converted text