2 files changed, 86 insertions, 0 deletions
diff --git a/src/mailman/interfaces/mailinglist.py b/src/mailman/interfaces/mailinglist.py
index 23d2fadf4..f112b2a11 100644
--- a/src/mailman/interfaces/mailinglist.py
+++ b/src/mailman/interfaces/mailinglist.py
@@ -25,6 +25,7 @@ __all__ = [
     'IMailingList',
     'Personalization',
     'ReplyToMunging',
+    'SubscriptionPolicy',
     ]
 
 
@@ -53,6 +54,18 @@ class ReplyToMunging(Enum):
     explicit_header = 2
 
 
+class SubscriptionPolicy(Enum):
+    # Neither confirmation, nor moderator approval is required.
+    open = 0
+    # The user must confirm the subscription.
+    confirm = 1
+    # The moderator must approve the subscription.
+    moderate = 2
+    # The user must first confirm their subscription, and then if that is
+    # successful, the moderator must also approve it.
+    confirm_then_moderate = 3
+
+
 
 class IMailingList(Interface):
     """A mailing list."""
@@ -234,6 +247,9 @@ class IMailingList(Interface):
         deliver disabled or not, or of the type of digest they are to
         receive.""")
 
+    subscription_policy = Attribute(
+        """The policy for subscribing new members to the list.""")
+
     subscribers = Attribute(
         """An iterator over all IMembers subscribed to this list, with any
         role.
diff --git a/src/mailman/interfaces/workflowstate.py b/src/mailman/interfaces/workflowstate.py
new file mode 100644
index 000000000..186386170
--- /dev/null
+++ b/src/mailman/interfaces/workflowstate.py
@@ -0,0 +1,70 @@
+# Copyright (C) 2007-2015 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Interface describing the state of a workflow."""
+
+__all__ = [
+    'IWorkflowState',
+    'IWorkflowStateManager',
+    ]
+
+
+from zope.interface import Interface, Attribute
+
+
+
+class IWorkflowState(Interface):
+    """The state of a workflow."""
+
+    name = Attribute(
+        """The name of the workflow.""")
+
+    key = Attribute(
+        """A unique key identifying the workflow instance.""")
+
+    step = Attribute(
+        """This workflow's next step.""")
+
+    data = Attribute(
+        """Additional data (may be JSON-encodedeJSON .""")
+
+
+
+class IWorkflowStateManager(Interface):
+    """The workflow states manager."""
+
+    def save(name, key, step, data=None):
+        """Save the state of a workflow
+
+        :param name: The name of the workflow.
+        :type name: str
+        :param key: A unique key identifying this workflow instance.
+        :type key: str
+        :param step: The next step for this workflow.
+        :type step: str
+        :param data: Additional data (workflow-specific).
+        :type data: str
+        """
+
+    def restore(name, key):
+        """Get the saved state for a workflow or None if nothing was saved.
+
+        :param name: The name of the workflow.
+        :type name: str
+        :param key: A unique key identifying this workflow instance.
+        :type key: str
+        """