diff options
Diffstat (limited to 'src/mailman/commands')
| -rw-r--r-- | src/mailman/commands/eml_confirm.py | 5 | ||||
| -rw-r--r-- | src/mailman/commands/eml_membership.py | 12 | ||||
| -rw-r--r-- | src/mailman/commands/tests/test_confirm.py | 6 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/mailman/commands/eml_confirm.py b/src/mailman/commands/eml_confirm.py index 8522f8fa0..b8e1610c4 100644 --- a/src/mailman/commands/eml_confirm.py +++ b/src/mailman/commands/eml_confirm.py @@ -20,8 +20,7 @@ from mailman import public from mailman.core.i18n import _ from mailman.interfaces.command import ContinueProcessing, IEmailCommand -from mailman.interfaces.workflowmanager import IWorkflowManager -from mailman.interfaces.subscriptions import TokenOwner +from mailman.interfaces.subscriptions import ISubscriptionManager, TokenOwner from zope.component import getAdapter from zope.interface import implementer @@ -52,7 +51,7 @@ class Confirm: results.confirms = tokens try: new_token, token_owner, member = getAdapter( - mlist, IWorkflowManager, name='subscribe').confirm(token) + mlist, ISubscriptionManager, name='subscribe').confirm(token) if new_token is None: assert token_owner is TokenOwner.no_one, token_owner assert member is not None, member diff --git a/src/mailman/commands/eml_membership.py b/src/mailman/commands/eml_membership.py index fad1cbe50..4e2e78f5d 100644 --- a/src/mailman/commands/eml_membership.py +++ b/src/mailman/commands/eml_membership.py @@ -22,8 +22,8 @@ from mailman import public from mailman.core.i18n import _ from mailman.interfaces.command import ContinueProcessing, IEmailCommand from mailman.interfaces.member import DeliveryMode, MemberRole -from mailman.interfaces.workflowmanager import IWorkflowManager -from mailman.interfaces.subscriptions import ISubscriptionService +from mailman.interfaces.subscriptions import ( + ISubscriptionManager, ISubscriptionService) from mailman.interfaces.usermanager import IUserManager from zope.component import getAdapter, getUtility from zope.interface import implementer @@ -31,7 +31,7 @@ from zope.interface import implementer def match_subscriber(email, display_name): # Return something matching the email which should be used as the - # subscriber by the IWorkflowManager interface. + # subscriber by the ISubscriptionManager interface. manager = getUtility(IUserManager) # Is there a user with a preferred address matching the email? user = manager.get_user(email) @@ -102,7 +102,7 @@ used. return ContinueProcessing.yes subscriber = match_subscriber(email, display_name) getAdapter( - mlist, IWorkflowManager, name='subscribe').register(subscriber) + mlist, ISubscriptionManager, name='subscribe').register(subscriber) print(_('Confirmation email sent to $person'), file=results) return ContinueProcessing.yes @@ -187,8 +187,8 @@ You may be asked to confirm your request.""") '$self.name: $email is not a member of $mlist.fqdn_listname'), file=results) return ContinueProcessing.no - getAdapter( - mlist, IWorkflowManager, name='unsubscribe').register(user_address) + getAdapter(mlist, ISubscriptionManager, name='unsubscribe').register( + user_address) # member.unsubscribe() person = formataddr((user.display_name, email)) # noqa print(_('Confirmation email sent to $person to leave' diff --git a/src/mailman/commands/tests/test_confirm.py b/src/mailman/commands/tests/test_confirm.py index 797edcad5..7351bd6b7 100644 --- a/src/mailman/commands/tests/test_confirm.py +++ b/src/mailman/commands/tests/test_confirm.py @@ -25,7 +25,7 @@ from mailman.config import config from mailman.email.message import Message from mailman.interfaces.command import ContinueProcessing from mailman.interfaces.mailinglist import SubscriptionPolicy -from mailman.interfaces.workflowmanager import IWorkflowManager +from mailman.interfaces.subscriptions import ISubscriptionManager from mailman.interfaces.usermanager import IUserManager from mailman.runners.command import CommandRunner, Results from mailman.testing.helpers import get_queue_messages, make_testable_runner @@ -43,7 +43,7 @@ class TestConfirm(unittest.TestCase): anne = getUtility(IUserManager).create_address( 'anne@example.com', 'Anne Person') self._token, token_owner, member = getAdapter( - self._mlist, IWorkflowManager, name='subscribe').register(anne) + self._mlist, ISubscriptionManager, name='subscribe').register(anne) self._command = Confirm() # Clear the virgin queue. get_queue_messages('virgin') @@ -89,7 +89,7 @@ class TestEmailResponses(unittest.TestCase): # Clear any previously queued confirmation messages. get_queue_messages('virgin') self._token, token_owner, member = getAdapter( - self._mlist, IWorkflowManager, name='subscribe').register(bart) + self._mlist, ISubscriptionManager, name='subscribe').register(bart) # There should now be one email message in the virgin queue, i.e. the # confirmation message sent to Bart. items = get_queue_messages('virgin', expected_count=1) |