aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ08nY2017-08-06 02:58:21 +0200
committerJ08nY2017-08-06 02:58:21 +0200
commit627f6273101cd3bdbe8a2221b741af68155b2932 (patch)
tree5effca24c73c41d4bf1a506a7a6341259a47e31a
parent009a60e504f9441aace4a490bfe811d0471e2dfd (diff)
downloadmailman-pgp-627f6273101cd3bdbe8a2221b741af68155b2932.tar.gz
mailman-pgp-627f6273101cd3bdbe8a2221b741af68155b2932.tar.zst
mailman-pgp-627f6273101cd3bdbe8a2221b741af68155b2932.zip
-rw-r--r--src/mailman_pgp/workflows/base.py2
-rw-r--r--src/mailman_pgp/workflows/subscription.py8
-rw-r--r--src/mailman_pgp/workflows/tests/test_base.py6
3 files changed, 8 insertions, 8 deletions
diff --git a/src/mailman_pgp/workflows/base.py b/src/mailman_pgp/workflows/base.py
index 82dd291..bffcf94 100644
--- a/src/mailman_pgp/workflows/base.py
+++ b/src/mailman_pgp/workflows/base.py
@@ -39,7 +39,7 @@ class PGPMixin:
self.pgp_address = PGPAddress.for_email(value)
self.member = self.mlist.regular_members.get_member(value)
- def _step_pgp_prepare(self):
+ def _step_create_address(self):
self.pgp_address = PGPAddress.for_address(self.address)
if self.pgp_address is None:
with transaction() as t:
diff --git a/src/mailman_pgp/workflows/subscription.py b/src/mailman_pgp/workflows/subscription.py
index bba33cf..0ef1358 100644
--- a/src/mailman_pgp/workflows/subscription.py
+++ b/src/mailman_pgp/workflows/subscription.py
@@ -64,7 +64,7 @@ class OpenSubscriptionPolicy(SubscriptionBase, VerificationMixin,
self.push('do_subscription')
self.push('pubkey_confirmation')
self.push('pubkey_checks')
- self.push('pgp_prepare')
+ self.push('create_address')
self.push('verification_checks')
self.push('sanity_checks')
@@ -105,7 +105,7 @@ class ConfirmSubscriptionPolicy(SubscriptionBase, VerificationMixin,
self.push('do_subscription')
self.push('pubkey_confirmation')
self.push('pubkey_checks')
- self.push('pgp_prepare')
+ self.push('create_address')
self.push('confirmation_checks')
self.push('verification_checks')
self.push('sanity_checks')
@@ -148,7 +148,7 @@ class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin,
self.push('mod_approval')
self.push('pubkey_confirmation')
self.push('pubkey_checks')
- self.push('pgp_prepare')
+ self.push('create_address')
self.push('verification_checks')
self.push('sanity_checks')
@@ -194,7 +194,7 @@ class ConfirmModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin,
self.push('mod_approval')
self.push('pubkey_confirmation')
self.push('pubkey_checks')
- self.push('pgp_prepare')
+ self.push('create_address')
self.push('confirmation_checks')
self.push('verification_checks')
self.push('sanity_checks')
diff --git a/src/mailman_pgp/workflows/tests/test_base.py b/src/mailman_pgp/workflows/tests/test_base.py
index febd8b9..3904105 100644
--- a/src/mailman_pgp/workflows/tests/test_base.py
+++ b/src/mailman_pgp/workflows/tests/test_base.py
@@ -85,7 +85,7 @@ class PGPTestWorkflow(SubscriptionBase, PGPMixin, SetPubkeyMixin,
self.push('do_subscription')
self.push('pubkey_confirmation')
self.push('pubkey_checks')
- self.push('pgp_prepare')
+ self.push('create_address')
self.push('sanity_checks')
@@ -94,7 +94,7 @@ class TestPGPMixin(PubkeyMixinTestSetup, unittest.TestCase):
def test_create_address(self):
workflow = PGPTestWorkflow(self.mlist, self.sender)
- workflow.run_thru('pgp_prepare')
+ workflow.run_thru('create_address')
pgp_address = PGPAddress.for_address(self.sender)
self.assertIsNotNone(pgp_address)
@@ -103,7 +103,7 @@ class TestPGPMixin(PubkeyMixinTestSetup, unittest.TestCase):
with transaction() as t:
pgp_address = PGPAddress(self.sender)
t.add(pgp_address)
- workflow.run_thru('pgp_prepare')
+ workflow.run_thru('create_address')
still = PGPAddress.for_address(self.sender)
self.assertIsNotNone(still)