Merge lp:~abompard/mailman/subpolicy into lp:~barry/mailman/subpolicy-2

[Aurélien Bompard]

[lp:~abompard/mailman/subpolicy]

7321. By Barry Warsaw on 2015-04-03

Plumb subscription policy through to the REST API. Given by abompard.

=== modified file 'src/mailman/rest/docs/listconf.rst'
--- src/mailman/rest/docs/listconf.rst	2015-01-05 01:20:33 +0000
+++ src/mailman/rest/docs/listconf.rst	2015-03-31 10:42:37 +0000
@@ -61,6 +61,7 @@
     scheme: http
     send_welcome_message: True
     subject_prefix: [Ant]
+    subscription_policy: confirm
     volume: 1
     web_host: lists.example.com
     welcome_message_uri: mailman:///welcome.txt
@@ -106,6 +107,7 @@
     ...             reply_to_address='[e-mail]',
     ...             send_welcome_message=False,
     ...             subject_prefix='[ant]',
+    ...             subscription_policy='moderate',
     ...             welcome_message_uri='mailman:///welcome.txt',
     ...             default_member_action='hold',
     ...             default_nonmember_action='discard',
@@ -156,6 +158,7 @@
     ...
     send_welcome_message: False
     subject_prefix: [ant]
+    subscription_policy: moderate
     ...
     welcome_message_uri: mailman:///welcome.txt
 

=== modified file 'src/mailman/rest/listconf.py'
--- src/mailman/rest/listconf.py	2015-01-05 01:40:47 +0000
+++ src/mailman/rest/listconf.py	2015-03-31 10:42:37 +0000
@@ -29,7 +29,8 @@
 from mailman.interfaces.action import Action
 from mailman.interfaces.archiver import ArchivePolicy
 from mailman.interfaces.autorespond import ResponseAction
-from mailman.interfaces.mailinglist import IAcceptableAliasSet, ReplyToMunging
+from mailman.interfaces.mailinglist import (
+    IAcceptableAliasSet, ReplyToMunging, SubscriptionPolicy)
 from mailman.rest.helpers import (
     GetterSetter, bad_request, etag, no_content, okay)
 from mailman.rest.validator import PatchValidator, Validator, enum_validator
@@ -142,6 +143,7 @@
     scheme=GetterSetter(None),
     send_welcome_message=GetterSetter(as_boolean),
     subject_prefix=GetterSetter(str),
+    subscription_policy=GetterSetter(enum_validator(SubscriptionPolicy)),
     volume=GetterSetter(None),
     web_host=GetterSetter(None),
     welcome_message_uri=GetterSetter(str),

=== modified file 'src/mailman/rest/tests/test_listconf.py'
--- src/mailman/rest/tests/test_listconf.py	2015-01-05 01:22:39 +0000
+++ src/mailman/rest/tests/test_listconf.py	2015-03-31 10:42:37 +0000
@@ -79,6 +79,7 @@
                 reply_to_address='[e-mail]',
                 send_welcome_message=False,
                 subject_prefix='[ant]',
+                subscription_policy='confirm_then_moderate',
                 welcome_message_uri='mailman:///welcome.txt',
                 default_member_action='hold',
                 default_nonmember_action='discard',