summaryrefslogtreecommitdiff
path: root/src/mailman/app
diff options
context:
space:
mode:
authorBarry Warsaw2016-09-08 21:14:48 +1200
committerBarry Warsaw2016-09-08 21:14:48 +1200
commit655e04a60c0745664a4b33274f6c8b380428a88f (patch)
tree4079c102de7417c14c2d1cab5ff2958bcff3ba26 /src/mailman/app
parent447b9bd6df0113ca7e2332d6ad20c01691f3ce07 (diff)
downloadmailman-655e04a60c0745664a4b33274f6c8b380428a88f.tar.gz
mailman-655e04a60c0745664a4b33274f6c8b380428a88f.tar.zst
mailman-655e04a60c0745664a4b33274f6c8b380428a88f.zip
A few more changes.
Diffstat (limited to 'src/mailman/app')
-rw-r--r--src/mailman/app/subscriptions.py5
-rw-r--r--src/mailman/app/tests/test_unsubscriptions.py4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py
index 52c0ddfbc..b3648e0f9 100644
--- a/src/mailman/app/subscriptions.py
+++ b/src/mailman/app/subscriptions.py
@@ -356,6 +356,7 @@ class UnSubscriptionWorkflow(Workflow):
self.address = None
self.user = None
self.which = None
+ self.member = None
self._set_token(TokenOwner.no_one)
# `subscriber` should be an implementer of IAddress.
if IAddress.providedBy(subscriber):
@@ -581,7 +582,7 @@ class BaseSubscriptionManager:
@public
@implementer(ISubscriptionManager)
-class SubscriptionWorkflowManager(BaseSubscriptionManager):
+class SubscriptionManager(BaseSubscriptionManager):
"""Handle registrations and confirmations for subscriptions."""
def _get_workflow(self):
@@ -601,7 +602,7 @@ class SubscriptionWorkflowManager(BaseSubscriptionManager):
@public
@implementer(ISubscriptionManager)
-class UnsubscriptionWorkflowManager(BaseSubscriptionManager):
+class UnsubscriptionManager(BaseSubscriptionManager):
"""Handle un-subscriptions and confirmations for un-subscriptions."""
def _get_workflow(self):
diff --git a/src/mailman/app/tests/test_unsubscriptions.py b/src/mailman/app/tests/test_unsubscriptions.py
index 9eec027b0..7a22c86dd 100644
--- a/src/mailman/app/tests/test_unsubscriptions.py
+++ b/src/mailman/app/tests/test_unsubscriptions.py
@@ -321,8 +321,8 @@ request approval:
message['From'], 'test-confirm+{}@example.com'.format(token))
def test_do_confirmation_unsubscribes_user(self):
- # Un-subscriptions to the mailing list must be confirmed. Once that's
- # done, the user's address is unsubscribed
+ # Unsubscriptions to the mailing list must be confirmed. Once that's
+ # done, the user's address is unsubscribed.
self._mlist.unsubscription_policy = SubscriptionPolicy.confirm
workflow = UnSubscriptionWorkflow(self._mlist, self.anne)
list(workflow)