aboutsummaryrefslogtreecommitdiff
path: root/src/mailman_pgp/mta/bulk.py
diff options
context:
space:
mode:
authorJ08nY2017-08-23 20:12:10 +0200
committerJ08nY2017-08-23 20:12:10 +0200
commita0997fb8e5893fed2c2275ff0cfbfa892b261601 (patch)
tree926f093cbe087a8c7f69705f159fe85ff8799caa /src/mailman_pgp/mta/bulk.py
parent43cc9d3e2c76c82bd00ce46ee7de6d69d07f3bb3 (diff)
downloadmailman-pgp-a0997fb8e5893fed2c2275ff0cfbfa892b261601.tar.gz
mailman-pgp-a0997fb8e5893fed2c2275ff0cfbfa892b261601.tar.zst
mailman-pgp-a0997fb8e5893fed2c2275ff0cfbfa892b261601.zip
Diffstat (limited to 'src/mailman_pgp/mta/bulk.py')
-rw-r--r--src/mailman_pgp/mta/bulk.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mailman_pgp/mta/bulk.py b/src/mailman_pgp/mta/bulk.py
index a01b5a7..1c4f213 100644
--- a/src/mailman_pgp/mta/bulk.py
+++ b/src/mailman_pgp/mta/bulk.py
@@ -24,7 +24,6 @@ from public import public
from mailman_pgp.model.address import PGPAddress
from mailman_pgp.model.list import PGPMailingList
from mailman_pgp.pgp.mime import MIMEWrapper
-from mailman_pgp.utils.email import overwrite_message
class CallbackBulkDelivery(BulkDelivery):
@@ -92,16 +91,14 @@ class PGPBulkMixin:
wrapped = MIMEWrapper(msg)
if pgp_list.sign_outgoing:
if pgp_list.encrypt_outgoing:
- out = wrapped.sign_encrypt(pgp_list.key, pgp_list.pubkey,
- *keys, throw_keyid=True)
+ wrapped.sign_encrypt(pgp_list.key, pgp_list.pubkey,
+ *keys, throw_keyid=True)
else:
- out = wrapped.sign(pgp_list.key)
+ wrapped.sign(pgp_list.key)
else:
# Definitely encrypt here, the case where we don't encrypt or sign
# is handled above at the start of the func.
- out = wrapped.encrypt(pgp_list.pubkey, *keys, throw_keyid=True)
-
- overwrite_message(out, msg)
+ wrapped.encrypt(pgp_list.pubkey, *keys, throw_keyid=True)
@public