Simplify the implementation.

This merges the SubscriptionManager and UnsubscriptionManager into a
single SubscriptionManager implementation that handles both register()
and unregister().  This allows us to use direct class-based adaptation
instead of the more clunky getAdapter() API.  We can also eliminate the
funky _get_workflow() implementation detail.

This has a couple of side-effects.  .confirm() must lookup the token in
the pendings database and pull out the pending type, dispatching to the
proper class depending on the type, or raising a LookupError if the
token is None or there is no pendable associated with the given token.
This feels like an acceptable trade-off.

However, this *also* means that IWorkflowStateManager must lose its
'name' argument in its methods.  That's because we won't actually know
the name until its too late.  Honestly, the name wasn't providing much
value anyway (it was always the subclass's name), so losing that seems
fine too.  The complication here is that the name was a primary key in
the 'workflowstate' table, so we need to add its removal in the database
migration.

1 files changed, 0 insertions, 9 deletions

diff --git a/src/mailman/app/tests/test_subscriptions.py b/src/mailman/app/tests/test_subscriptions.py
index 9f02593a9..a6a00d80e 100644
--- a/src/mailman/app/tests/test_subscriptions.py
+++ b/src/mailman/app/tests/test_subscriptions.py
@@ -359,8 +359,6 @@ class TestSubscriptionWorkflow(unittest.TestCase):
                                         pre_verified=True,
                                         pre_confirmed=True,
                                         pre_approved=True)
-        # Cache the token.
-        token = workflow.token
         # Consume the entire state machine.
         list(workflow)
         # Anne is now a member of the mailing list.
@@ -370,13 +368,6 @@ class TestSubscriptionWorkflow(unittest.TestCase):
         # The workflow is done, so it has no token.
         self.assertIsNone(workflow.token)
         self.assertEqual(workflow.token_owner, TokenOwner.no_one)
-        # The pendable associated with the token has been evicted.
-        self.assertIsNone(getUtility(IPendings).confirm(token, expunge=False))
-        # There is no saved workflow associated with the token.  This shows up
-        # as an exception when we try to restore the workflow.
-        new_workflow = SubscriptionWorkflow(self._mlist)
-        new_workflow.token = token
-        self.assertRaises(LookupError, new_workflow.restore)
 
     def test_moderator_approves(self):
         # The workflow runs until moderator approval is required, at which