feature/wrappers-modify

3 files changed, 4 insertions, 17 deletions

diff --git a/src/mailman_pgp/workflows/key_change.py b/src/mailman_pgp/workflows/key_change.py
index 1d07903..66fb4e9 100644
--- a/src/mailman_pgp/workflows/key_change.py
+++ b/src/mailman_pgp/workflows/key_change.py
@@ -29,7 +29,6 @@ from zope.interface import implementer
 from mailman_pgp.config import config
 from mailman_pgp.database import transaction
 from mailman_pgp.pgp.wrapper import PGPWrapper
-from mailman_pgp.utils.email import copy_headers
 from mailman_pgp.workflows.base import PGPMixin
 from mailman_pgp.workflows.mod_approval import (
     ModeratorKeyChangeApprovalMixin)
@@ -96,11 +95,8 @@ class KeyChangeBase(Workflow, PGPMixin):
                                CHANGE_CONFIRM_REQUEST.format(
                                        self.pubkey.fingerprint,
                                        self.token))
-        wrapped = PGPWrapper(msg)
-        encrypted = wrapped.sign_encrypt(self.pgp_list.key, self.pubkey)
+        PGPWrapper(msg).sign_encrypt(self.pgp_list.key, self.pubkey)
 
-        msg.set_payload(encrypted.get_payload())
-        copy_headers(encrypted, msg, True)
         msg.send(self.mlist)
         raise StopIteration
 
diff --git a/src/mailman_pgp/workflows/key_confirm.py b/src/mailman_pgp/workflows/key_confirm.py
index 0a38551..cf87832 100644
--- a/src/mailman_pgp/workflows/key_confirm.py
+++ b/src/mailman_pgp/workflows/key_confirm.py
@@ -23,7 +23,6 @@ from public import public
 from mailman_pgp.database import transaction
 from mailman_pgp.model.list import PGPMailingList
 from mailman_pgp.pgp.wrapper import PGPWrapper
-from mailman_pgp.utils.email import copy_headers
 
 CONFIRM_REQUEST = """\
 ----------
@@ -65,11 +64,8 @@ class ConfirmPubkeyMixin:
                                        self.pgp_address.key_fingerprint,
                                        self.token))
         pgp_list = PGPMailingList.for_list(self.mlist)
-        wrapped = PGPWrapper(msg)
-        encrypted = wrapped.sign_encrypt(pgp_list.key, self.pgp_address.key)
+        PGPWrapper(msg).sign_encrypt(pgp_list.key, self.pgp_address.key)
 
-        msg.set_payload(encrypted.get_payload())
-        copy_headers(encrypted, msg, True)
         msg.send(self.mlist)
         raise StopIteration
 
diff --git a/src/mailman_pgp/workflows/mod_approval.py b/src/mailman_pgp/workflows/mod_approval.py
index 367f773..ea3369b 100644
--- a/src/mailman_pgp/workflows/mod_approval.py
+++ b/src/mailman_pgp/workflows/mod_approval.py
@@ -16,7 +16,6 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """"""
-import copy
 
 from mailman.email.message import UserNotification
 from mailman.interfaces.pending import IPendings
@@ -25,7 +24,6 @@ from public import public
 from zope.component import getUtility
 
 from mailman_pgp.pgp.mime import MIMEWrapper
-from mailman_pgp.utils.email import overwrite_message
 
 SUBSCRIPTION_MOD_REQUEST = """\
 ----------
@@ -83,11 +81,8 @@ class ModeratorApprovalMixin:
             msg = UserNotification(
                     self.mlist.owner_address, self.mlist.owner_address,
                     subject, body, self.mlist.preferred_language)
-            out = copy.deepcopy(msg)
-            wrapped = MIMEWrapper(msg)
-            msg = wrapped.attach_keys(self.pubkey)
-            overwrite_message(msg, out)
-            out.send(self.mlist)
+            MIMEWrapper(msg).attach_keys(self.pubkey)
+            msg.send(self.mlist)
         raise StopIteration
 
     def _step_receive_mod_confirmation(self):