------------------------------------------------------------
revno: 1104
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2008-06-20 16:21:29 -0700
message:
More bounce recognition improvements.
added:
tests/bounces/simple_30.txt
tests/bounces/simple_31.txt
tests/bounces/simple_32.txt
tests/bounces/simple_33.txt
modified:
Mailman/Bouncers/SimpleMatch.py
tests/test_bounces.py
=== modified file 'Mailman/Bouncers/SimpleMatch.py'
--- a/Mailman/Bouncers/SimpleMatch.py 2008-06-15 19:39:31 +0000
+++ b/Mailman/Bouncers/SimpleMatch.py 2008-06-20 23:21:29 +0000
@@ -88,7 +88,7 @@
_c('--- Original message follows\.'),
_c('<(?P<addr>[^>]*)>:')),
# googlemail.com
- (_c('Delivery to the following recipient failed'),
+ (_c('Delivery to the following recipient(s)? failed'),
_c('----- Original message -----'),
_c('^\s*(?P<addr>[EMAIL PROTECTED]@[EMAIL PROTECTED])\s*$')),
# kundenserver.de, mxlogic.net
@@ -99,13 +99,13 @@
(_c('A message that you( have)? sent could not be delivered'),
_c('^---'),
_c('^(?P<addr>[EMAIL PROTECTED]@[^\s@:]+):')),
- # thehartford.com
- (_c('Delivery to the following recipients failed'),
+ # thehartford.com and amenworld.com
+ (_c('Del(i|e)very to the following recipient(s)? (failed|was aborted)'),
# this one may or may not have the original message, but there's nothing
# unique to stop on, so stop on the first line of at least 3 characters
# that doesn't start with 'D' (to not stop immediately) and has no '@'.
_c('[EMAIL PROTECTED],}$'),
- _c('^\s*(?P<addr>[EMAIL PROTECTED]@[EMAIL PROTECTED])\s*$')),
+ _c('^\s*(. )?(?P<addr>[EMAIL PROTECTED]@[EMAIL PROTECTED])\s*$')),
# and another thehartfod.com/hartfordlife.com
(_c('^Your message\s*$'),
_c('^because:'),
=== added file 'tests/bounces/simple_30.txt'
--- a/tests/bounces/simple_30.txt 1970-01-01 00:00:00 +0000
+++ b/tests/bounces/simple_30.txt 2008-06-20 23:21:29 +0000
@@ -0,0 +1,72 @@
+Return-Path: <[EMAIL PROTECTED]>
+Received: from rs-so-b2.amenworld.com (rs-so-b2.amenworld.com [62.193.206.27])
+ by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+ k9H6S7E3014456
+ for <[EMAIL PROTECTED]>; Mon, 16 Oct 2006 23:28:07 -0700
+Received: from av3.amenworld.com (av3.amenworld.com [62.193.206.46])
+ by rs-so-b2.amenworld.com (Postfix) with ESMTP id 93A72655806
+ for <[EMAIL PROTECTED]>; Tue, 17 Oct 2006 08:33:33 +0200 (CEST)
+Date: Tue, 17 Oct 2006 08:27:49 +0200
+From: Mail Delivery System <[EMAIL PROTECTED]>
+To: [EMAIL PROTECTED]
+Subject: Delivery status notification
+MIME-Version: 1.0
+Content-Type: multipart/report;
+ boundary="------------I305M09060309060P_013011610664690"
+Message-Id: <[EMAIL PROTECTED]>
+X-SongbirdInformation: [EMAIL PROTECTED] for more information
+X-Songbird: Clean
+X-Songbird-From:
+
+This is a multi-part message in MIME format.
+
+--------------I305M09060309060P_013011610664690
+Content-Type: text/plain; charset=UTF-8;
+Content-Transfer-Encoding: 8bit
+
+============================================================================
+ This is an automatically generated Delivery Status Notification.
+
+Delivery to the following recipients failed permanently:
+
+ * [EMAIL PROTECTED]
+
+
+============================================================================
+ Technical details:
+
+SMTP:RCPT host 62.193.203.102: 553 5.3.0 <[EMAIL PROTECTED]>... No such user
here
+
+
+============================================================================
+
+
+--------------I305M09060309060P_013011610664690
+Content-Type: message/rfc822; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment
+
+
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+ by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
k9H62Ktt011069
+ for <[EMAIL PROTECTED]>; Mon, 16 Oct 2006 23:02:20 -0700
+Subject: The results of your email commands
+From: [EMAIL PROTECTED]
+To: [EMAIL PROTECTED]
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============0123257981=="
+Message-ID: <[EMAIL PROTECTED]>
+Date: Mon, 16 Oct 2006 23:02:19 -0700
+Precedence: bulk
+X-BeenThere: [EMAIL PROTECTED]
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: [EMAIL PROTECTED]
+Errors-To: [EMAIL PROTECTED]
+X-SongbirdInformation: [EMAIL PROTECTED] for more information
+X-Songbird: Clean
+X-Songbird-From: [EMAIL PROTECTED]
+
+--------------I305M09060309060P_013011610664690--
+
=== added file 'tests/bounces/simple_31.txt'
--- a/tests/bounces/simple_31.txt 1970-01-01 00:00:00 +0000
+++ b/tests/bounces/simple_31.txt 2008-06-20 23:21:29 +0000
@@ -0,0 +1,106 @@
+Return-Path: <>
+Received: from rs-so-b1.amenworld.com (rs-so-b1.amenworld.com [62.193.206.26])
+ by alan.rezo.net (Postfix) with ESMTP id 0E7913B02A3
+ for <[EMAIL PROTECTED]>;
+ Fri, 20 Jun 2008 20:24:00 +0200 (CEST)
+Received: from av2.amenworld.com (av2.amenworld.com [62.193.206.45])
+ by rs-so-b1.amenworld.com (Postfix) with ESMTP id 5A7EA55884
+ for <[EMAIL PROTECTED]>;
+ Fri, 20 Jun 2008 20:38:06 +0200 (CEST)
+Date: Fri, 20 Jun 2008 20:23:54 +0200
+From: Mail Delivery System <>
+To: [EMAIL PROTECTED]
+Subject: Delivery status notification
+MIME-Version: 1.0
+Content-Type: multipart/report;
+ boundary="------------I305M09060309060P_788012139862340"
+Message-Id: <[EMAIL PROTECTED]>
+
+This is a multi-part message in MIME format.
+
+--------------I305M09060309060P_788012139862340
+Content-Type: text/plain; charset=UTF-8;
+Content-Transfer-Encoding: 8bit
+
+ This is an automatically generated Delivery Status Notification.
+
+Delivery to the following recipients failed permanently:
+
+ * [EMAIL PROTECTED]
+
+
+
+--------------I305M09060309060P_788012139862340
+Content-Type: message/delivery-status; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+
+Reporting-MTA: dns; av2.amenworld.com [62.193.206.40]
+Received-From-MTA: dns; alan.rezo.net [217.24.84.2]
+Arrival-Date: Fri, 20 Jun 2008 20:23:54 +0200
+
+--------------I305M09060309060P_788012139862340
+Content-Type: message/rfc822; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment
+
+Received: from alan.rezo.net (localhost.rezo.net [127.0.0.1])
+ by alan.rezo.net (Postfix) with ESMTP id 5BC1D3B02BC;
+ Fri, 20 Jun 2008 20:23:58 +0200 (CEST)
+Received: from localhost (localhost.rezo.net [127.0.0.1])
+ by alan.rezo.net (Postfix) with ESMTP id AB2183B02BE
+ for <[EMAIL PROTECTED]>;
+ Fri, 20 Jun 2008 20:23:54 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at rezo.net
+X-Spam-Score: 0.66
+X-Spam-Level:
+X-Spam-Status: No, score=0.66 tagged_above=-100 required=5 tests=[AWL=-0.507,
+ BAYES_00=-2.599, DNS_FROM_RFC_ABUSE=0.2, DNS_FROM_RFC_POST=1.708,
+ HTML_50_60=0.134, HTML_MESSAGE=0.001, SUBJECT_ENCODED_TWICE=1.723]
+Received: from alan.rezo.net ([127.0.0.1])
+ by localhost (alan.rezo.net [127.0.0.1]) (amavisd-new, port 10024)
+ with LMTP id jkfSPXMXefwG for <[EMAIL PROTECTED]>;
+ Fri, 20 Jun 2008 20:23:47 +0200 (CEST)
+Received: from neuf-infra-smtp-out-sp604006av.neufgp.fr
+ (neuf-infra-smtp-out-sp604006av.neufgp.fr [84.96.92.121])
+ by alan.rezo.net (Postfix) with ESMTP id 6FD2D3B02A3
+ for <[EMAIL PROTECTED]>;
+ Fri, 20 Jun 2008 20:23:47 +0200 (CEST)
+Received: from neuf-infra-smtp-out-sp604001av.neufgp.fr ([10.110.56.120])
+ by neuf-infra-smtp-out-sp604006av.neufgp.fr with neuf telecom
+ id g8W91Z0022bdnoS06JPk5X; Fri, 20 Jun 2008 20:23:45 +0200
+Received: from [192.168.1.2] ([84.101.242.132])
+ by neuf-infra-smtp-out-sp604001av.neufgp.fr with neuf telecom
+ id gJPk1Z00R2s6HG401JPk5j; Fri, 20 Jun 2008 20:23:45 +0200
+Mime-Version: 1.0 (Apple Message framework v753.1)
+To: "Liste de travail du collectif Uni(e)s contre une immigration jetable"
+ <[EMAIL PROTECTED]>
+Message-Id: <[EMAIL PROTECTED]>
+References: <[EMAIL PROTECTED]>
+From: Stephen Suffern <[EMAIL PROTECTED]>
+Date: Fri, 20 Jun 2008 20:23:43 +0200
+X-Mailer: Apple Mail (2.753.1)
+Subject: [Immigration.jetable] =?iso-8859-1?q?Fwd=3A_=5BGisti-membres=5D_P?=
+
=?iso-8859-1?q?lainte_du_Minist=E8re_de_l=27Int=E9rieur_contre_le_collect?=
+ =?iso-8859-1?q?if_de_soutien_aux_sans_papiers_de_RENNES?=
+X-BeenThere: [EMAIL PROTECTED]
+X-Mailman-Version: 2.1.11rc1
+Precedence: list
+Reply-To: "Liste de travail du collectif Uni\(e\)s contre une immigration
+ jetable" <[EMAIL PROTECTED]>
+List-Id: "Liste de travail du collectif Uni\(e\)s contre une immigration
+ jetable" <immigration.jetable.rezo.net>
+List-Unsubscribe:
<http://listes.rezo.net/mailman/options/immigration.jetable>,
+ <mailto:[EMAIL PROTECTED]>
+List-Archive: <http://listes.rezo.net/mailman/private/immigration.jetable>
+List-Post: <mailto:[EMAIL PROTECTED]>
+List-Help: <mailto:[EMAIL PROTECTED]>
+List-Subscribe: <http://listes.rezo.net/mailman/listinfo/immigration.jetable>,
+ <mailto:[EMAIL PROTECTED]>
+Content-Type: multipart/mixed; boundary="===============1384174044=="
+Sender: [EMAIL PROTECTED]
+Errors-To: [EMAIL PROTECTED]
+
+
+
+--------------I305M09060309060P_788012139862340--
+
=== added file 'tests/bounces/simple_32.txt'
--- a/tests/bounces/simple_32.txt 1970-01-01 00:00:00 +0000
+++ b/tests/bounces/simple_32.txt 2008-06-20 23:21:29 +0000
@@ -0,0 +1,77 @@
+Return-Path: <[EMAIL PROTECTED]>
+Received: from rs-so-b2.amenworld.com (rs-so-b2.amenworld.com [62.193.206.27])
+ by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+ k9JJA48E031825
+ for <[EMAIL PROTECTED]>; Thu, 19 Oct 2006 12:10:04 -0700
+Received: from av2.amenworld.com (av2.amenworld.com [62.193.206.45])
+ by rs-so-b2.amenworld.com (Postfix) with ESMTP id A928C65499F
+ for <[EMAIL PROTECTED]>; Thu, 19 Oct 2006 21:15:48 +0200 (CEST)
+Date: Thu, 19 Oct 2006 21:09:45 +0200
+From: Mail Delivery System <[EMAIL PROTECTED]>
+To: [EMAIL PROTECTED]
+Subject: Delivery status notification
+MIME-Version: 1.0
+Content-Type: multipart/report;
+ boundary="------------I305M09060309060P_160911612849850"
+Message-Id: <[EMAIL PROTECTED]>
+X-SongbirdInformation: [EMAIL PROTECTED] for more information
+X-Songbird: Clean
+X-Songbird-From:
+
+This is a multi-part message in MIME format.
+
+--------------I305M09060309060P_160911612849850
+Content-Type: text/plain; charset=UTF-8;
+Content-Transfer-Encoding: 8bit
+
+============================================================================
+ This is an automatically generated Delivery Status Notification.
+
+Delevery to the following recipients was aborted after 5.0 hour(s):
+
+ * [EMAIL PROTECTED]
+
+
+============================================================================
+ Technical details:
+
+Routing: Could not find a gateway for [EMAIL PROTECTED]
+
+
+============================================================================
+
+
+--------------I305M09060309060P_160911612849850
+Content-Type: message/rfc822; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment
+
+
+Received: from sb7.songbird.com ([208.184.79.137])
+ by av2.amenworld.com with AMEN
+ id c6tn1V00i2xlHa80000000
+ for [EMAIL PROTECTED]; Thu, 19 Oct 2006 08:53:57 +0200
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+ by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
k9J6rxFD032578
+ for <[EMAIL PROTECTED]>; Wed, 18 Oct 2006 23:53:59 -0700
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Subject: Your message to GPC-talk awaits moderator approval
+From: [EMAIL PROTECTED]
+To: [EMAIL PROTECTED]
+Message-ID: <[EMAIL PROTECTED]>
+Date: Wed, 18 Oct 2006 23:53:58 -0700
+Precedence: bulk
+X-BeenThere: [EMAIL PROTECTED]
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: [EMAIL PROTECTED]
+Errors-To: [EMAIL PROTECTED]
+X-SongbirdInformation: [EMAIL PROTECTED] for more information
+X-Songbird: Clean
+X-Songbird-From: [EMAIL PROTECTED]
+
+--------------I305M09060309060P_160911612849850--
+
=== added file 'tests/bounces/simple_33.txt'
--- a/tests/bounces/simple_33.txt 1970-01-01 00:00:00 +0000
+++ b/tests/bounces/simple_33.txt 2008-06-20 23:21:29 +0000
@@ -0,0 +1,73 @@
+Return-Path: <[EMAIL PROTECTED]>
+Received: from rs-so-b1.amenworld.com (rs-so-b1.amenworld.com [62.193.206.26])
+ by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+ kBH8s3Gg013386
+ for <[EMAIL PROTECTED]>; Sun, 17 Dec 2006 00:54:04 -0800
+Received: from av2.amenworld.com (av2.amenworld.com [62.193.206.45])
+ by rs-so-b1.amenworld.com (Postfix) with ESMTP id A808154655
+ for <[EMAIL PROTECTED]>; Sun, 17 Dec 2006 09:55:47 +0100 (CET)
+Date: Sun, 17 Dec 2006 09:53:50 +0100
+From: Mail Delivery System <[EMAIL PROTECTED]>
+To: [EMAIL PROTECTED]
+Subject: Delivery status notification
+MIME-Version: 1.0
+Content-Type: multipart/report;
+ boundary="------------I305M09060309060P_699011663456300"
+Message-Id: <[EMAIL PROTECTED]>
+X-SongbirdInformation: [EMAIL PROTECTED] for more information
+X-Songbird: Clean
+X-Songbird-From:
+
+This is a multi-part message in MIME format.
+
+--------------I305M09060309060P_699011663456300
+Content-Type: text/plain; charset=UTF-8;
+Content-Transfer-Encoding: 8bit
+
+============================================================================
+ This is an automatically generated Delivery Status Notification.
+
+Delevery to the following recipients failed permanently:
+
+ * [EMAIL PROTECTED]
+
+
+============================================================================
+ Technical details:
+
+SMTP:RCPT host 62.193.203.20: 553 5.3.0 <[EMAIL PROTECTED]>... No such user
here
+
+
+============================================================================
+
+
+--------------I305M09060309060P_699011663456300
+Content-Type: message/rfc822; charset=UFT-8;
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment
+
+
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+ by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
kBH8rlWO013350
+ for <[EMAIL PROTECTED]>; Sun, 17 Dec 2006 00:53:47 -0800
+Subject: reconstitute
+From: [EMAIL PROTECTED]
+To: [EMAIL PROTECTED]
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============1426064790=="
+Message-ID: <[EMAIL PROTECTED]>
+Date: Sun, 17 Dec 2006 00:53:46 -0800
+Precedence: bulk
+X-BeenThere: [EMAIL PROTECTED]
+X-Mailman-Version: 2.1.5
+List-Id: GPC Wednesday Ride List <wed_ride.grizz.org>
+X-List-Administrivia: yes
+Sender: [EMAIL PROTECTED]
+Errors-To: [EMAIL PROTECTED]
+X-SongbirdInformation: [EMAIL PROTECTED] for more information
+X-Songbird: Clean
+X-Songbird-From: [EMAIL PROTECTED]
+
+--------------I305M09060309060P_699011663456300--
+
+
=== modified file 'tests/test_bounces.py'
--- a/tests/test_bounces.py 2008-06-15 19:39:31 +0000
+++ b/tests/test_bounces.py 2008-06-20 23:21:29 +0000
@@ -67,6 +67,10 @@
('SimpleMatch', 'simple_26.txt', ['[EMAIL PROTECTED]']),
('SimpleMatch', 'simple_27.txt', ['[EMAIL PROTECTED]']),
('SimpleMatch', 'simple_29.txt', ['[EMAIL PROTECTED]']),
+ ('SimpleMatch', 'simple_30.txt', ['[EMAIL PROTECTED]']),
+ ('SimpleMatch', 'simple_31.txt', ['[EMAIL PROTECTED]']),
+ ('SimpleMatch', 'simple_32.txt', ['[EMAIL PROTECTED]']),
+ ('SimpleMatch', 'simple_33.txt', ['[EMAIL PROTECTED]']),
('SimpleMatch', 'bounce_02.txt', ['[EMAIL PROTECTED]']),
('SimpleMatch', 'bounce_03.txt', ['[EMAIL PROTECTED]']),
# SimpleWarning
--
Stable, maintained release series
https://code.launchpad.net/~mailman-coders/mailman/2.1
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
