diff options
Diffstat (limited to 'src/mailman_pgp/workflows/subscription.py')
| -rw-r--r-- | src/mailman_pgp/workflows/subscription.py | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/src/mailman_pgp/workflows/subscription.py b/src/mailman_pgp/workflows/subscription.py index a571b44..6b8240c 100644 --- a/src/mailman_pgp/workflows/subscription.py +++ b/src/mailman_pgp/workflows/subscription.py @@ -29,8 +29,8 @@ from mailman_pgp.workflows.base import PubkeyMixin @public @implementer(ISubscriptionWorkflow) -class ConfimSubscriptionPolicy(SubscriptionBase, VerificationMixin, - ConfirmationMixin, PubkeyMixin): +class ConfirmSubscriptionPolicy(SubscriptionBase, VerificationMixin, + ConfirmationMixin, PubkeyMixin): """""" name = 'pgp-policy-confirm' @@ -40,7 +40,8 @@ class ConfimSubscriptionPolicy(SubscriptionBase, VerificationMixin, save_attributes = ( 'verified', 'confirmed', - 'pubkey', + 'pubkey_key', + 'pubkey_confirmed', 'address_key', 'subscriber_key', 'user_key', @@ -48,11 +49,13 @@ class ConfimSubscriptionPolicy(SubscriptionBase, VerificationMixin, ) def __init__(self, mlist, subscriber=None, *, - pre_verified=False, pre_confirmed=False, pubkey=None): + pre_verified=False, pre_confirmed=False, pubkey=None, + pubkey_pre_confirmed=False): SubscriptionBase.__init__(self, mlist, subscriber) VerificationMixin.__init__(self, pre_verified=pre_verified) ConfirmationMixin.__init__(self, pre_confirmed=pre_confirmed) - PubkeyMixin.__init__(self, pubkey=pubkey) + PubkeyMixin.__init__(self, pubkey=pubkey, + pre_confirmed=pubkey_pre_confirmed) def _step_prepare(self): self.push('do_subscription') @@ -75,7 +78,8 @@ class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, save_attributes = ( 'verified', 'approved', - 'pubkey', + 'pubkey_key', + 'pubkey_confirmed', 'address_key', 'subscriber_key', 'user_key', @@ -83,11 +87,13 @@ class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, ) def __init__(self, mlist, subscriber=None, *, - pre_verified=False, pre_approved=False, pubkey=None): + pre_verified=False, pre_approved=False, pubkey=None, + pubkey_pre_confirmed=False): SubscriptionBase.__init__(self, mlist, subscriber) VerificationMixin.__init__(self, pre_verified=pre_verified) ModerationMixin.__init__(self, pre_approved=pre_approved) - PubkeyMixin.__init__(self, pubkey=pubkey) + PubkeyMixin.__init__(self, pubkey=pubkey, + pre_confirmed=pubkey_pre_confirmed) def _step_prepare(self): self.push('do_subscription') @@ -112,7 +118,8 @@ class ConfirmModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, 'verified', 'confirmed', 'approved', - 'pubkey', + 'pubkey_key', + 'pubkey_confirmed', 'address_key', 'subscriber_key', 'user_key', @@ -121,12 +128,13 @@ class ConfirmModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, def __init__(self, mlist, subscriber=None, *, pre_verified=False, pre_confirmed=False, pre_approved=False, - pubkey=None): + pubkey=None, pubkey_pre_confirmed=False): 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) - PubkeyMixin.__init__(self, pubkey=pubkey) + PubkeyMixin.__init__(self, pubkey=pubkey, + pre_confirmed=pubkey_pre_confirmed) def _step_prepare(self): self.push('do_subscription') |