1 files changed, 12 insertions, 9 deletions

diff --git a/src/mailman_pgp/workflows/subscription.py b/src/mailman_pgp/workflows/subscription.py
index 809b7cb..d5803c2 100644
--- a/src/mailman_pgp/workflows/subscription.py
+++ b/src/mailman_pgp/workflows/subscription.py
@@ -19,13 +19,15 @@
 
 from mailman.core.i18n import _
 from mailman.interfaces.workflows import ISubscriptionWorkflow
-from mailman.workflows.common import (ConfirmationMixin, ModerationMixin,
-                                      SubscriptionBase, VerificationMixin)
+from mailman.workflows.common import (ConfirmationMixin, SubscriptionBase,
+                                      VerificationMixin)
 from public import public
 from zope.interface import implementer
 
 from mailman_pgp.workflows.base import PGPMixin
-from mailman_pgp.workflows.pubkey import ConfirmPubkeyMixin, SetPubkeyMixin
+from mailman_pgp.workflows.key_confirm import ConfirmPubkeyMixin
+from mailman_pgp.workflows.key_set import SetPubkeyMixin
+from mailman_pgp.workflows.mod_approval import ModeratorSubApprovalMixin
 
 
 @public
@@ -112,7 +114,7 @@ class ConfirmSubscriptionPolicy(SubscriptionBase, VerificationMixin,
 @public
 @implementer(ISubscriptionWorkflow)
 class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin,
-                                   ModerationMixin, SetPubkeyMixin,
+                                   ModeratorSubApprovalMixin, SetPubkeyMixin,
                                    ConfirmPubkeyMixin, PGPMixin):
     """"""
 
@@ -136,14 +138,14 @@ class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin,
                  pubkey_pre_confirmed=False):
         SubscriptionBase.__init__(self, mlist, subscriber)
         VerificationMixin.__init__(self, pre_verified=pre_verified)
-        ModerationMixin.__init__(self, pre_approved=pre_approved)
+        ModeratorSubApprovalMixin.__init__(self, pre_approved=pre_approved)
         SetPubkeyMixin.__init__(self, pubkey=pubkey)
         ConfirmPubkeyMixin.__init__(self, pre_confirmed=pubkey_pre_confirmed)
         PGPMixin.__init__(self)
 
     def _step_prepare(self):
         self.push('do_subscription')
-        self.push('moderation_checks')
+        self.push('mod_approval')
         self.push('pubkey_confirmation')
         self.push('pubkey_checks')
         self.push('pgp_prepare')
@@ -154,7 +156,8 @@ class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin,
 @public
 @implementer(ISubscriptionWorkflow)
 class ConfirmModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin,
-                                          ConfirmationMixin, ModerationMixin,
+                                          ConfirmationMixin,
+                                          ModeratorSubApprovalMixin,
                                           SetPubkeyMixin, ConfirmPubkeyMixin,
                                           PGPMixin):
     """"""
@@ -181,14 +184,14 @@ class ConfirmModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin,
         SubscriptionBase.__init__(self, mlist, subscriber)
         VerificationMixin.__init__(self, pre_verified=pre_verified)
         ConfirmationMixin.__init__(self, pre_confirmed=pre_confirmed)
-        ModerationMixin.__init__(self, pre_approved=pre_approved)
+        ModeratorSubApprovalMixin.__init__(self, pre_approved=pre_approved)
         SetPubkeyMixin.__init__(self, pubkey=pubkey)
         ConfirmPubkeyMixin.__init__(self, pre_confirmed=pubkey_pre_confirmed)
         PGPMixin.__init__(self)
 
     def _step_prepare(self):
         self.push('do_subscription')
-        self.push('moderation_checks')
+        self.push('mod_approval')
         self.push('pubkey_confirmation')
         self.push('pubkey_checks')
         self.push('pgp_prepare')