plugin

3 files changed, 7 insertions, 7 deletions

diff --git a/src/mailman/commands/docs/membership.rst b/src/mailman/commands/docs/membership.rst
index 18c473c5b..e1266d690 100644
--- a/src/mailman/commands/docs/membership.rst
+++ b/src/mailman/commands/docs/membership.rst
@@ -221,9 +221,9 @@ to leave it.  Because the mailing list allows for *open* unsubscriptions
 (i.e. no confirmation is needed), when she sends a message to the ``-leave``
 address for the list, she is immediately removed.
 
-    >>> from mailman.interfaces.mailinglist import SubscriptionPolicy
-    >>> mlist_2.unsubscription_policy = SubscriptionPolicy.open
-    >>> mlist.unsubscription_policy = SubscriptionPolicy.open
+    >>> from mailman.workflows.unsubscription import OpenUnsubscriptionPolicy
+    >>> mlist_2.unsubscription_policy = OpenUnsubscriptionPolicy
+    >>> mlist.unsubscription_policy = OpenUnsubscriptionPolicy
     >>> results = Results()
     >>> print(leave.process(mlist_2, msg, {}, (), results))
     ContinueProcessing.yes
diff --git a/src/mailman/commands/tests/test_eml_confirm.py b/src/mailman/commands/tests/test_eml_confirm.py
index 1ef392b76..d17a084f7 100644
--- a/src/mailman/commands/tests/test_eml_confirm.py
+++ b/src/mailman/commands/tests/test_eml_confirm.py
@@ -24,7 +24,6 @@ from mailman.commands.eml_confirm import Confirm
 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.subscriptions import ISubscriptionManager
 from mailman.interfaces.usermanager import IUserManager
 from mailman.runners.command import CommandRunner, Results
@@ -32,6 +31,7 @@ from mailman.testing.helpers import (
     get_queue_messages, make_testable_runner,
     specialized_message_from_string as mfs, subscribe)
 from mailman.testing.layers import ConfigLayer
+from mailman.workflows.subscription import ConfirmModerationSubscriptionPolicy
 from zope.component import getUtility
 
 
@@ -109,7 +109,7 @@ class TestEmailResponses(unittest.TestCase):
     def test_confirm_then_moderate_workflow(self):
         # Issue #114 describes a problem when confirming the moderation email.
         self._mlist.subscription_policy = (
-            SubscriptionPolicy.confirm_then_moderate)
+            ConfirmModerationSubscriptionPolicy)
         bart = getUtility(IUserManager).create_address(
             'bart@example.com', 'Bart Person')
         # Clear any previously queued confirmation messages.
diff --git a/src/mailman/commands/tests/test_eml_membership.py b/src/mailman/commands/tests/test_eml_membership.py
index 6cf4802c6..d90e3319e 100644
--- a/src/mailman/commands/tests/test_eml_membership.py
+++ b/src/mailman/commands/tests/test_eml_membership.py
@@ -22,11 +22,11 @@ import unittest
 from mailman.app.lifecycle import create_list
 from mailman.commands.eml_membership import Leave
 from mailman.email.message import Message
-from mailman.interfaces.mailinglist import SubscriptionPolicy
 from mailman.interfaces.usermanager import IUserManager
 from mailman.runners.command import Results
 from mailman.testing.helpers import set_preferred
 from mailman.testing.layers import ConfigLayer
+from mailman.workflows.unsubscription import ConfirmUnsubscriptionPolicy
 from zope.component import getUtility
 
 
@@ -38,7 +38,7 @@ class TestLeave(unittest.TestCase):
         self._command = Leave()
 
     def test_confirm_leave_not_a_member(self):
-        self._mlist.unsubscription_policy = SubscriptionPolicy.confirm
+        self._mlist.unsubscription_policy = ConfirmUnsubscriptionPolicy
         # Try to unsubscribe someone who is not a member.  Anne is a real
         # user, with a validated address, but she is not a member of the
         # mailing list.