smtp_direct.py is dead and gone.

4 files changed, 59 insertions, 16 deletions

diff --git a/src/mailman/mta/docs/bulk.txt b/src/mailman/mta/docs/bulk.txt
index 99f58e7a7..57431d2f8 100644
--- a/src/mailman/mta/docs/bulk.txt
+++ b/src/mailman/mta/docs/bulk.txt
@@ -154,10 +154,12 @@ there are no calculated recipients, nothing gets sent.
 
     >>> bulk = BulkDelivery()
     >>> bulk.deliver(mlist, msg, {})
+    {}
     >>> len(list(smtpd.messages))
     0
 
     >>> bulk.deliver(mlist, msg, dict(recipients=set()))
+    {}
     >>> len(list(smtpd.messages))
     0
 
diff --git a/src/mailman/mta/docs/decorating.txt b/src/mailman/mta/docs/decorating.txt
index 490974913..935d9e349 100644
--- a/src/mailman/mta/docs/decorating.txt
+++ b/src/mailman/mta/docs/decorating.txt
@@ -99,8 +99,10 @@ The decorations happen when the message is delivered.
     MIME-Version: 1.0
     Content-Type: text/plain; charset="us-ascii"
     Content-Transfer-Encoding: 7bit
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+aperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: aperson@example.com
     <BLANKLINE>
     Delivery address: aperson@example.com
@@ -118,8 +120,10 @@ The decorations happen when the message is delivered.
     MIME-Version: 1.0
     Content-Type: text/plain; charset="us-ascii"
     Content-Transfer-Encoding: 7bit
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+bperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: bperson@example.com
     <BLANKLINE>
     Delivery address: bperson@example.com
@@ -137,8 +141,10 @@ The decorations happen when the message is delivered.
     MIME-Version: 1.0
     Content-Type: text/plain; charset="us-ascii"
     Content-Transfer-Encoding: 7bit
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+cperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: cperson@example.com
     <BLANKLINE>
     Delivery address: cperson@example.com
@@ -171,8 +177,10 @@ into the message metadata.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+aperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: aperson@example.com
     <BLANKLINE>
     This is a test.
@@ -181,8 +189,10 @@ into the message metadata.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+bperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: bperson@example.com
     <BLANKLINE>
     This is a test.
@@ -191,8 +201,10 @@ into the message metadata.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+cperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: cperson@example.com
     <BLANKLINE>
     This is a test.
diff --git a/src/mailman/mta/docs/personalized.txt b/src/mailman/mta/docs/personalized.txt
index 4485fd2fc..7e4331b97 100644
--- a/src/mailman/mta/docs/personalized.txt
+++ b/src/mailman/mta/docs/personalized.txt
@@ -57,8 +57,10 @@ By default, the To header is not personalized.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+aperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: aperson@example.com
     <BLANKLINE>
     This is a test.
@@ -67,8 +69,10 @@ By default, the To header is not personalized.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+bperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: bperson@example.com
     <BLANKLINE>
     This is a test.
@@ -77,8 +81,10 @@ By default, the To header is not personalized.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+cperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: cperson@example.com
     <BLANKLINE>
     This is a test.
@@ -108,8 +114,10 @@ the recipient's address and name.
     To: aperson@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+aperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: aperson@example.com
     <BLANKLINE>
     This is a test.
@@ -118,8 +126,10 @@ the recipient's address and name.
     To: bperson@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+bperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: bperson@example.com
     <BLANKLINE>
     This is a test.
@@ -128,8 +138,10 @@ the recipient's address and name.
     To: cperson@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+cperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: cperson@example.com
     <BLANKLINE>
     This is a test.
@@ -160,8 +172,10 @@ associated real name, then this name also shows up in the To header.
     To: aperson@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+aperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: aperson@example.com
     <BLANKLINE>
     This is a test.
@@ -170,8 +184,10 @@ associated real name, then this name also shows up in the To header.
     To: Bill Person <bperson@example.com>
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+bperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: bperson@example.com
     <BLANKLINE>
     This is a test.
@@ -180,8 +196,10 @@ associated real name, then this name also shows up in the To header.
     To: Cate Person <cperson@example.com>
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces@example.com
+    Errors-To: test-bounces@example.com
     X-Peer: ...
-    X-MailFrom: test-bounces+cperson=example.com@example.com
+    X-MailFrom: test-bounces@example.com
     X-RcptTo: cperson@example.com
     <BLANKLINE>
     This is a test.
diff --git a/src/mailman/mta/docs/verp.txt b/src/mailman/mta/docs/verp.txt
index c7c14e714..e31419bdb 100644
--- a/src/mailman/mta/docs/verp.txt
+++ b/src/mailman/mta/docs/verp.txt
@@ -52,10 +52,12 @@ If there are no recipients, there's nothing to do.
     ... """)
 
     >>> verp.deliver(mlist, msg, {})
+    {}
     >>> len(list(smtpd.messages))
     0
 
     >>> verp.deliver(mlist, msg, dict(recipients=set()))
+    {}
     >>> len(list(smtpd.messages))
     0
 
@@ -74,7 +76,10 @@ intended recipient's delivery address.
     ...     'cperson@example.com',
     ...     ])
 
-    >>> verp.deliver(mlist, msg, dict(recipients=recipients))
+VERPing is only actually done if the metadata requests it.
+
+    >>> msgdata = dict(recipients=recipients, verp=True)
+    >>> verp.deliver(mlist, msg, msgdata)
     {}
     >>> messages = list(smtpd.messages)
     >>> len(messages)
@@ -88,6 +93,8 @@ intended recipient's delivery address.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces+aperson=example.com@example.com
+    Errors-To: test-bounces+aperson=example.com@example.com
     X-Peer: ...
     X-MailFrom: test-bounces+aperson=example.com@example.com
     X-RcptTo: aperson@example.com
@@ -98,6 +105,8 @@ intended recipient's delivery address.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces+bperson=example.com@example.com
+    Errors-To: test-bounces+bperson=example.com@example.com
     X-Peer: ...
     X-MailFrom: test-bounces+bperson=example.com@example.com
     X-RcptTo: bperson@example.com
@@ -108,6 +117,8 @@ intended recipient's delivery address.
     To: test@example.com
     Subject: test one
     Message-ID: <aardvark>
+    Sender: test-bounces+cperson=example.com@example.com
+    Errors-To: test-bounces+cperson=example.com@example.com
     X-Peer: ...
     X-MailFrom: test-bounces+cperson=example.com@example.com
     X-RcptTo: cperson@example.com