Remove the action.py module, move this to Mailman/interfaces/__init__.py.

Convert IMailingList.personalize to a enum.

Change all non-obsolete occurances of GetListEmail() to posting_address.

3 files changed, 83 insertions, 2 deletions

diff --git a/Mailman/docs/cook-headers.txt b/Mailman/docs/cook-headers.txt
index ffe2dfa5f..62c80b186 100644
--- a/Mailman/docs/cook-headers.txt
+++ b/Mailman/docs/cook-headers.txt
@@ -292,3 +292,37 @@ List-Archive header either.
     List-Unsubscribe: <http://lists.example.com/listinfo/_xtest@example.com>,
     	<mailto:_xtest-leave@example.com>
     ---end---
+
+
+Personalization
+---------------
+
+The To field normally contains the list posting address.  However when
+messages are fully personalized, that header will get overwritten with the
+address of the recipient.  The list's posting address will be added to one of
+the recipient headers so that users will be able to reply back to the list.
+
+    >>> from Mailman.interfaces import Personalization, ReplyToMunging
+    >>> mlist.personalize = Personalization.full
+    >>> mlist.reply_goes_to_list = ReplyToMunging.no_munging
+    >>> flush()
+    >>> msg = message_from_string("""\
+    ... From: aperson@example.com
+    ...
+    ... """, Message)
+    >>> process(mlist, msg, {})
+    >>> print msg.as_string()
+    From: aperson@example.com
+    X-BeenThere: _xtest@example.com
+    X-Mailman-Version: ...
+    Precedence: list
+    Cc: My test mailing list <_xtest@example.com>
+    List-Id: My test mailing list <_xtest.example.com>
+    List-Unsubscribe: <http://lists.example.com/listinfo/_xtest@example.com>,
+    	<mailto:_xtest-leave@example.com>
+    List-Post: <mailto:_xtest@example.com>
+    List-Help: <mailto:_xtest-request@example.com?subject=help>
+    List-Subscribe: <http://lists.example.com/listinfo/_xtest@example.com>,
+    	<mailto:_xtest-join@example.com>
+    <BLANKLINE>
+    <BLANKLINE>
diff --git a/Mailman/docs/news-runner.txt b/Mailman/docs/news-runner.txt
index ecc32570f..834423c6e 100644
--- a/Mailman/docs/news-runner.txt
+++ b/Mailman/docs/news-runner.txt
@@ -116,4 +116,50 @@ the message.
     <BLANKLINE>
 
 
+Newsgroup moderation
+--------------------
+
+When the newsgroup is moderated, an Approved: header with the list's posting
+address is added for the benefit of the Usenet system.
+
+    >>> from Mailman.interfaces import NewsModeration
+    >>> mlist.news_moderation = NewsModeration.open_moderated
+    >>> flush()
+    >>> msg = message_from_string("""\
+    ... From: aperson@example.com
+    ... To: _xtest@example.com
+    ... Approved: this gets deleted
+    ...
+    ... """)
+    >>> prepare_message(mlist, msg, {})
+    >>> msg['approved']
+    '_xtest@example.com'
+
+    >>> mlist.news_moderation = NewsModeration.moderated
+    >>> flush()
+    >>> msg = message_from_string("""\
+    ... From: aperson@example.com
+    ... To: _xtest@example.com
+    ... Approved: this gets deleted
+    ...
+    ... """)
+    >>> prepare_message(mlist, msg, {})
+    >>> msg['approved']
+    '_xtest@example.com'
+
+But if the newsgroup is not moderated, the Approved: header is not chnaged.
+
+    >>> mlist.news_moderation = NewsModeration.none
+    >>> flush()
+    >>> msg = message_from_string("""\
+    ... From: aperson@example.com
+    ... To: _xtest@example.com
+    ... Approved: this doesn't get deleted
+    ...
+    ... """)
+    >>> prepare_message(mlist, msg, {})
+    >>> msg['approved']
+    "this doesn't get deleted"
+
+
 XXX More of the NewsRunner should be tested.
diff --git a/Mailman/docs/outgoing.txt b/Mailman/docs/outgoing.txt
index c1ecffb00..05dac1fe4 100644
--- a/Mailman/docs/outgoing.txt
+++ b/Mailman/docs/outgoing.txt
@@ -70,7 +70,8 @@ If the list is set to personalize deliveries, and the global configuration
 option to VERP personalized deliveries is set, then the message will be
 VERP'd.
 
-    >>> mlist.personalize = True
+    >>> from Mailman.interfaces import Personalization
+    >>> mlist.personalize = Personalization.individual
     >>> flush()
     >>> config.VERP_PERSONALIZED_DELIVERIES = True
     >>> msgdata = dict(foo=1, bar=2)
@@ -96,7 +97,7 @@ the global configuration variable VERP_DELIVERY_INTERVAL.  This variable tells
 Mailman how often to VERP even non-personalized mailing lists.  It can be set
 to zero, which means non-personalized messages will never be VERP'd.
 
-    >>> mlist.personalize = False
+    >>> mlist.personalize = Personalization.none
     >>> flush()
     >>> config.VERP_DELIVERY_INTERVAL = 0
     >>> msgdata = dict(foo=1, bar=2)