Simplified the various list settings and remamed several things.

3 files changed, 13 insertions, 22 deletions

diff --git a/src/mailman/rest/docs/listconf.rst b/src/mailman/rest/docs/listconf.rst
index da9f1e299..343e50715 100644
--- a/src/mailman/rest/docs/listconf.rst
+++ b/src/mailman/rest/docs/listconf.rst
@@ -44,16 +44,14 @@ All readable attributes for a list are available on a sub-resource.
     digest_volume_frequency: monthly
     digests_enabled: True
     display_name: Ant
-    dmarc_moderation_action: none
+    dmarc_mitigate_action: no_mitigation
+    dmarc_mitigate_unconditionally: False
     dmarc_moderation_notice:
-    dmarc_none_moderation_action: False
-    dmarc_quarantine_moderation_action: True
     dmarc_wrapped_message_text:
     filter_content: False
     first_strip_reply_to: False
     footer_uri:
     fqdn_listname: ant@example.com
-    from_is_list: none
     goodbye_message_uri:
     header_uri:
     http_etag: "..."
@@ -116,15 +114,13 @@ When using ``PUT``, all writable attributes must be included.
     ...             digest_size_threshold=10.5,
     ...             digest_volume_frequency='yearly',
     ...             digests_enabled=False,
-    ...             dmarc_moderation_action='munge_from',
+    ...             dmarc_mitigate_action='munge_from',
+    ...             dmarc_mitigate_unconditionally=False,
     ...             dmarc_moderation_notice='Some moderation notice',
-    ...             dmarc_none_moderation_action=True,
-    ...             dmarc_quarantine_moderation_action=False,
     ...             dmarc_wrapped_message_text='some message text',
     ...             posting_pipeline='virgin',
     ...             filter_content=True,
     ...             first_strip_reply_to=True,
-    ...             from_is_list='none',
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
     ...             reply_goes_to_list='point_to_list',
@@ -174,10 +170,9 @@ These values are changed permanently.
     digest_volume_frequency: yearly
     digests_enabled: False
     display_name: Fnords
-    dmarc_moderation_action: munge_from
+    dmarc_mitigate_action: munge_from
+    dmarc_mitigate_unconditionally: False
     dmarc_moderation_notice: Some moderation notice
-    dmarc_none_moderation_action: True
-    dmarc_quarantine_moderation_action: False
     dmarc_wrapped_message_text: some message text
     filter_content: True
     first_strip_reply_to: True
diff --git a/src/mailman/rest/listconf.py b/src/mailman/rest/listconf.py
index 416336142..d5a1ca0c1 100644
--- a/src/mailman/rest/listconf.py
+++ b/src/mailman/rest/listconf.py
@@ -24,8 +24,8 @@ from mailman.interfaces.archiver import ArchivePolicy
 from mailman.interfaces.autorespond import ResponseAction
 from mailman.interfaces.digests import DigestFrequency
 from mailman.interfaces.mailinglist import (
-    DMARCModerationAction, FromIsList, IAcceptableAliasSet, IMailingList,
-    ReplyToMunging, SubscriptionPolicy)
+    DMARCMitigateAction, IAcceptableAliasSet, IMailingList, ReplyToMunging,
+    SubscriptionPolicy)
 from mailman.interfaces.template import ITemplateManager
 from mailman.rest.helpers import (
     GetterSetter, bad_request, etag, no_content, not_found, okay)
@@ -152,16 +152,14 @@ ATTRIBUTES = dict(
     digest_size_threshold=GetterSetter(float),
     digest_volume_frequency=GetterSetter(enum_validator(DigestFrequency)),
     digests_enabled=GetterSetter(as_boolean),
-    dmarc_moderation_action=GetterSetter(
-        enum_validator(DMARCModerationAction)),
+    dmarc_mitigate_action=GetterSetter(
+        enum_validator(DMARCMitigateAction)),
+    dmarc_mitigate_unconditionally=GetterSetter(as_boolean),
     dmarc_moderation_notice=GetterSetter(str),
-    dmarc_none_moderation_action=GetterSetter(as_boolean),
-    dmarc_quarantine_moderation_action=GetterSetter(as_boolean),
     dmarc_wrapped_message_text=GetterSetter(str),
     filter_content=GetterSetter(as_boolean),
     first_strip_reply_to=GetterSetter(as_boolean),
     fqdn_listname=GetterSetter(None),
-    from_is_list=GetterSetter(enum_validator(FromIsList)),
     include_rfc2369_headers=GetterSetter(as_boolean),
     info=GetterSetter(str),
     join_address=GetterSetter(None),
diff --git a/src/mailman/rest/tests/test_listconf.py b/src/mailman/rest/tests/test_listconf.py
index d9eb91c02..b9b64464c 100644
--- a/src/mailman/rest/tests/test_listconf.py
+++ b/src/mailman/rest/tests/test_listconf.py
@@ -62,14 +62,12 @@ RESOURCE = dict(
     digest_volume_frequency='monthly',
     digests_enabled=True,
     display_name='Fnords',
-    dmarc_moderation_action='munge_from',
+    dmarc_mitigate_action='munge_from',
+    dmarc_mitigate_unconditionally=False,
     dmarc_moderation_notice='Some moderation notice',
-    dmarc_none_moderation_action=True,
-    dmarc_quarantine_moderation_action=False,
     dmarc_wrapped_message_text='some message text',
     filter_content=True,
     first_strip_reply_to=True,
-    from_is_list='none',
     goodbye_message_uri='mailman:///goodbye.txt',
     include_rfc2369_headers=False,
     info='This is the mailing list info',