------------------------------------------------------------
revno: 1040
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Fri 2009-02-20 16:48:47 -0800
message:
Merged changes from 2.1 branch.
added:
tests/bounces/simple_35.txt
tests/bounces/simple_36.txt
modified:
Mailman/Bouncers/SimpleMatch.py
Mailman/Bouncers/SimpleWarning.py
misc/paths.py.in
tests/test_bounces.py
------------------------------------------------------------
revno: 984.1.194
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Fri 2009-02-20 14:22:04 -0800
message:
Recognize a couple more bounces.
added:
tests/bounces/simple_35.txt
tests/bounces/simple_36.txt
modified:
Mailman/Bouncers/SimpleMatch.py
Mailman/Bouncers/SimpleWarning.py
tests/test_bounces.py
------------------------------------------------------------
revno: 984.1.193
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Fri 2009-02-20 14:01:54 -0800
message:
Removed no longer used import.
modified:
misc/paths.py.in
=== modified file 'Mailman/Bouncers/SimpleMatch.py'
--- Mailman/Bouncers/SimpleMatch.py 2009-02-14 22:20:46 +0000
+++ Mailman/Bouncers/SimpleMatch.py 2009-02-20 22:22:04 +0000
@@ -170,6 +170,10 @@
(_c('The following recipient.*could not be reached'),
_c('bogus stop pattern'),
_c('^(?P<addr>[...@]+@[...@]+)\s*$')),
+ # lttf.com
+ (_c('Could not deliver message to'),
+ _c('^\s*--'),
+ _c('^Failed Recipient:\s*(?P<addr>[...@]+@[...@]+)\s*$')),
# Next one goes here...
]
=== modified file 'Mailman/Bouncers/SimpleWarning.py'
--- Mailman/Bouncers/SimpleWarning.py 2008-06-15 04:30:07 +0000
+++ Mailman/Bouncers/SimpleWarning.py 2009-02-20 22:22:04 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2009 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -53,6 +53,10 @@
(_c('THIS IS A WARNING MESSAGE ONLY'),
_c('Message will be retried'),
_c(r'\s*(?P<addr>\...@\s+)\s*')),
+ # RS ver 1.0.95vs ? - see comments for MessageSwitch
+ (_c('We will continue to try to deliver'),
+ _c('.+'),
+ _c('(?P<addr>.+)')),
# Next one goes here...
]
=== modified file 'misc/paths.py.in'
--- misc/paths.py.in 2008-11-30 17:10:18 +0000
+++ misc/paths.py.in 2009-02-20 22:01:54 +0000
@@ -1,6 +1,6 @@
# -*- python -*-
-# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -26,7 +26,6 @@
import os
import sys
-from warnings import filterwarnings
# some scripts expect this attribute to be in this module
prefix = '@prefix@'
=== added file 'tests/bounces/simple_35.txt'
--- tests/bounces/simple_35.txt 1970-01-01 00:00:00 +0000
+++ tests/bounces/simple_35.txt 2009-02-20 22:22:04 +0000
@@ -0,0 +1,88 @@
+X-MimeOLE: Produced By Microsoft Exchange V6.5
+Content-class: urn:content-classes:message
+MIME-Version: 1.0
+Content-Type: text/plain;
+ charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+Subject: Mail Delivery Warning
+Date: Thu, 19 Feb 2009 16:12:07 -0800
+Message-ID: <[email protected]>
+X-MS-Has-Attach:
+X-MS-TNEF-Correlator:
+From: <[email protected]@xxx.com>
+To: <[email protected]>
+
+This is an advisory-only email. Please do not reply to it.
+ =09
+Delivery of email to this address
+ =09
+"[email protected]"
+ =09
+has been postponed due to a full mailbox.
+ =09
+We will continue to try to deliver your message over the next few days.
+ =09
+The first 50 lines of your original message follow:> Received: from =
+mx105.stngva01.us.mxservers.net (198.173.112.42)
+> by mail35b.att-webhosting.com (RS ver 1.0.95vs) with SMTP id =
+1-084358326
+> for <[email protected]>; Thu, 19 Feb 2009 19:05:26 -0500 (EST)
+> Received: from unknown [72.166.138.3] (EHLO xxx)
+> by va1-mx105.stngva01.us.mxservers.net (mxl_mta-3.1.0-05)
+> with ESMTP id =
+f93fd994.2809027488.147598.00-011.va1-mx105.stngva01.us.mxservers.net =
+(envelope-from <[email protected]>);
+> Thu, 19 Feb 2009 19:04:47 -0500 (EST)
+> Received: from localhost.xxx.com (unknown [127.0.0.1])
+> by xxx.com (Postfix) with ESMTP id 623F823FDE4;
+> Thu, 19 Feb 2009 15:56:58 -0800 (PST)
+> X-Original-To: [email protected]
+> Delivered-To: [email protected]
+> Received: from exchange.xxx.com (unknown [192.168.168.8])
+> by xxx.com (Postfix) with ESMTP id 4542723FDC5
+> for <[email protected]>; Thu, 19 Feb 2009 15:56:23 -0800 =
+(PST)
+> Received: from [192.168.168.219] ([192.168.168.219]) by =
+xxx.com
+> with Microsoft SMTPSVC(6.0.3790.1830);=20
+> Thu, 19 Feb 2009 15:57:06 -0800
+> User-Agent: Microsoft-Entourage/10.1.4.030702.0
+> Date: Thu, 19 Feb 2009 15:56:21 -0800
+> To: "Hunt Ads (New)" <[email protected]>
+> Message-ID: <c5c331a6.8c81%[email protected]>
+> Mime-version: 1.0
+> X-OriginalArrivalTime: 19 Feb 2009 23:57:07.0051 (UTC)
+> FILETIME=3D[C538D3B0:01C992ED]
+> From: Turners Huntads <[email protected]>
+> Subject: [Huntads] February 20 - February 26
+> X-BeenThere: [email protected]
+> X-Mailman-Version: 2.1.12rc2
+> Precedence: list
+> Reply-To: [email protected]
+> List-Id: Turners Huntads <huntads.xxx.com>
+> List-Unsubscribe: =
+<mailto:[email protected]?subject=3dunsubscribe>
+> List-Help: <mailto:[email protected]?subject=3dhelp>
+> List-Subscribe: =
+<mailto:[email protected]?subject=3dsubscribe>
+> Content-Type: multipart/mixed; =
+boundary=3D"=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0154225035=3D=3D=
+"
+> Sender: [email protected]
+> Errors-To: [email protected]
+> X-Spam: [F=3D0.3170731707; B=3D0.500(0); S=3D0.200(2009020301); =
+MH=3D0.650(2009021931)]
+> X-MAIL-FROM: <[email protected]>
+> X-SOURCE-IP: [72.166.138.3]
+> X-SF-Loop: 1
+>=20
+> > This message is in MIME format. Since your mail reader does not =
+understand
+> this format, some or all of this message may not be legible.
+>=20
+> --=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0154225035=3D=3D
+> Content-type: multipart/related; boundary=3D"B_3317903782_1289380"
+>=20
+> > This message is in MIME format. Since your mail reader does not =
+understand
+
=== added file 'tests/bounces/simple_36.txt'
--- tests/bounces/simple_36.txt 1970-01-01 00:00:00 +0000
+++ tests/bounces/simple_36.txt 2009-02-20 22:22:04 +0000
@@ -0,0 +1,61 @@
+X-MimeOLE: Produced By Microsoft Exchange V6.5
+Content-class: urn:content-classes:message
+MIME-Version: 1.0
+Content-Type: text/plain;
+ charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+Subject: Delivery Failure
+Date: Thu, 19 Feb 2009 16:19:28 -0800
+Message-ID: <[email protected]>
+X-MS-Has-Attach:
+X-MS-TNEF-Correlator:
+From: <"System Administrator"@xxx.com>
+To: <[email protected]>
+
+
+Could not deliver message to the following recipient(s):
+
+Failed Recipient: [email protected]
+Reason: Remote host said: 550 unknown user <[email protected]>
+
+ -- The header and top 20 lines of the message follows --
+
+Received: from xxx.com [72.166.138.3] by mx10.lttf.com with =
+SMTP;
+ Thu, 19 Feb 2009 16:19:20 -0800
+Received: from localhost.xxx.com (unknown [127.0.0.1])
+ by xxx.com (Postfix) with ESMTP id A2E78240229
+ for <[email protected]>; Thu, 19 Feb 2009 16:19:22 -0800 =
+(PST)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=3D"us-ascii"
+Content-Transfer-Encoding: 7bit
+From: [email protected]
+To: [email protected]
+Subject: confirm 05a7bc89604da1745a562d4bed327490f5022bb2
+Message-ID: <[email protected]>
+Date: Thu, 19 Feb 2009 16:18:40 -0800
+Precedence: bulk
+X-BeenThere: [email protected]
+X-Mailman-Version: 2.1.12rc2
+List-Id: Turners Huntads <huntads.xxx.com>
+X-List-Administrivia: yes
+Sender: [email protected]
+Errors-To: [email protected]
+
+Your membership in the mailing list Huntads has been disabled due to
+excessive bounces The last bounce received from you was dated
+19-Feb-2009. You will not get any more messages from this list until
+you re-enable your membership. You will receive 2 more reminders like
+this before your membership in the list is deleted.
+
+To re-enable your membership, you can simply respond to this message
+(leaving the Subject: line intact).
+
+If you have any questions or problems, you can contact the list owner
+at
+
+ [email protected]
+
+
+
=== modified file 'tests/test_bounces.py'
--- tests/test_bounces.py 2009-02-14 22:20:46 +0000
+++ tests/test_bounces.py 2009-02-20 22:22:04 +0000
@@ -72,6 +72,7 @@
('SimpleMatch', 'simple_32.txt', ['[email protected]']),
('SimpleMatch', 'simple_33.txt', ['[email protected]']),
('SimpleMatch', 'simple_34.txt', ['[email protected]']),
+ ('SimpleMatch', 'simple_36.txt', ['[email protected]']),
('SimpleMatch', 'bounce_02.txt', ['[email protected]']),
('SimpleMatch', 'bounce_03.txt', ['[email protected]']),
# SimpleWarning
@@ -79,6 +80,7 @@
('SimpleWarning', 'simple_21.txt', Stop),
('SimpleWarning', 'simple_22.txt', Stop),
('SimpleWarning', 'simple_28.txt', Stop),
+ ('SimpleWarning', 'simple_35.txt', Stop),
# GroupWise
('GroupWise', 'groupwise_01.txt', ['[email protected]']),
# This one really sucks 'cause it's text/html. Just make sure it
--
Active development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
