------------------------------------------------------------
revno: 1098
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Sat 2008-06-14 21:30:07 -0700
message:
  Added bounce recognition for googlemail delayed warning
added:
  tests/bounces/simple_28.txt
modified:
  Mailman/Bouncers/SimpleWarning.py
  NEWS
  tests/test_bounces.py

=== modified file 'Mailman/Bouncers/SimpleWarning.py'
--- a/Mailman/Bouncers/SimpleWarning.py 2007-11-12 05:40:15 +0000
+++ b/Mailman/Bouncers/SimpleWarning.py 2008-06-15 04:30:07 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2008 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
@@ -49,6 +49,10 @@
     (_c('Delivery attempts will continue to be made'),
      _c('.+'),
      _c('(?P<addr>.+)')),
+    # Googlemail
+    (_c('THIS IS A WARNING MESSAGE ONLY'),
+     _c('Message will be retried'),
+     _c(r'\s*(?P<addr>[EMAIL PROTECTED])\s*')),
     # Next one goes here...
     ]
 

=== modified file 'NEWS'
--- a/NEWS      2008-06-11 22:48:16 +0000
+++ b/NEWS      2008-06-15 04:30:07 +0000
@@ -61,6 +61,8 @@
     - Fixed a problem in Decorate.py that could result in a multipart
       message with no part headers for the original body part (1991348).
 
+    - Added bounce recognition for googlemail delayed warning.
+
   Miscellaneous
 
     - Brad Knowles' mailman daily status report script updated to 0.0.18.

=== added file 'tests/bounces/simple_28.txt'
--- a/tests/bounces/simple_28.txt       1970-01-01 00:00:00 +0000
+++ b/tests/bounces/simple_28.txt       2008-06-15 04:30:07 +0000
@@ -0,0 +1,79 @@
+Return-Path: <>
+Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.152])
+       by alan.rezo.net (Postfix) with ESMTP id 3909F3B0271
+       for <[EMAIL PROTECTED]>;
+       Sun, 15 Jun 2008 01:26:23 +0200 (CEST)
+Received: by fg-out-1718.google.com with SMTP id l27so3405949fgb.11
+       for <[EMAIL PROTECTED]>;
+       Sat, 14 Jun 2008 16:26:21 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+       d=googlemail.com; s=gamma;
+       h=domainkey-signature:received:received:message-id:from:to:subject
+       :date; bh=BFkuUFhgu/6jTo35rSt+ExVUNbJkbG7m9ZSeWMMiYys=;
+       b=iARaUItND8loi45qRlzvtfufPkNdALsDLbSkg2q1kT7kQ+4v0OXcW2oCV6u8r6c+Ty
+       hOaxiihkqMqgFknPssT6kaYS/u1IWeuEQnSltFULpQNh+rpW4yHC1hxUQ1jP6NRH3hfB
+       y3T3UN69T0sG9Szqe/1zVYEVPxAbdnJnygZ64=
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma;
+       h=message-id:from:to:subject:date;
+       b=FZYhpgymcWTMdaReUBtWfMMdThgG3Lk2UyVlK9XjPB7pwvAoTS8+eXQnP1IOC+iYQ+
+       2wkii49cJP1JmtmMJBDmAJ5Hhq34r5g8R8yQqx5iLvj7I7aLP4AnmGnhSxqb6LbM/CoF
+       xqjobWv+LjVHXV1Cy2oo0//B0M2mWKAv2/xGE=
+Received: by 10.86.26.1 with SMTP id 1mr6414899fgz.49.1213485981022;
+       Sat, 14 Jun 2008 16:26:21 -0700 (PDT)
+Received: by 10.86.26.1 with SMTP id 1mr8116260fgz.49;
+       Sat, 14 Jun 2008 16:26:21 -0700 (PDT)
+Message-ID: <[EMAIL PROTECTED]>
+From: Mail Delivery Subsystem <[EMAIL PROTECTED]>
+To: [EMAIL PROTECTED]
+Subject: Delivery Status Notification (Delay)
+Date: Sat, 14 Jun 2008 16:26:21 -0700 (PDT)
+
+This is an automatically generated Delivery Status Notification
+
+THIS IS A WARNING MESSAGE ONLY.
+
+YOU DO NOT NEED TO RESEND YOUR MESSAGE.
+
+Delivery to the following recipient has been delayed:
+
+     [EMAIL PROTECTED]
+
+Message will be retried for 2 more day(s)
+
+   ----- Message header follows -----
+
+Received: by 10.86.26.1 with SMTP id 1mr4665798fgz.49.1213394647106;
+        Fri, 13 Jun 2008 15:04:07 -0700 (PDT)
+Return-Path: <[EMAIL PROTECTED]>
+Received: from alan.rezo.net (alan.rezo.net [217.24.84.2])
+        by mx.google.com with ESMTP id 4si6055077fgg.9.2008.06.13.15.03.59;
+        Fri, 13 Jun 2008 15:04:07 -0700 (PDT)
+Received-SPF: pass (google.com: best guess record for domain of [EMAIL 
PROTECTED] designates 217.24.84.2 as permitted sender) client-ip=217.24.84.2;
+Authentication-Results: mx.google.com; spf=pass (google.com: best guess record 
for domain of [EMAIL PROTECTED] designates 217.24.84.2 as permitted sender) 
[EMAIL PROTECTED]
+Received: from alan.rezo.net (localhost.rezo.net [127.0.0.1])
+       by alan.rezo.net (Postfix) with ESMTP id 6A8E131CC54;
+       Sat, 14 Jun 2008 00:00:49 +0200 (CEST)
+Received: by alan.rezo.net (Postfix, from userid 1001)
+       id 17BCA31C00A; Sat, 14 Jun 2008 00:00:04 +0200 (CEST)
+To: [EMAIL PROTECTED]
+From: webdiff tracspip <[EMAIL PROTECTED]>
+Message-Id: <[EMAIL PROTECTED]>
+Date: Sat, 14 Jun 2008 00:00:04 +0200 (CEST)
+Subject: [spip-commit] webdiff tracspip 14.06.2008
+X-BeenThere: [EMAIL PROTECTED]
+X-Mailman-Version: 2.1.6b2
+Precedence: list
+List-Id: "SPIP : toutes les modifs du code" <spip-commit.rezo.net>
+List-Unsubscribe: <http://listes.rezo.net/mailman/listinfo/spip-commit>,
+       <mailto:[EMAIL PROTECTED]>
+List-Archive: <http://listes.rezo.net/archives/spip-commit>
+List-Post: <mailto:[EMAIL PROTECTED]>
+List-Help: <mailto:[EMAIL PROTECTED]>
+List-Subscribe: <http://listes.rezo.net/mailman/listinfo/spip-commit>,
+       <mailto:[EMAIL PROTECTED]>
+Content-Type: multipart/mixed; boundary="===============0262606712=="
+Sender: [EMAIL PROTECTED]
+Errors-To: [EMAIL PROTECTED]
+
+   ----- Message body suppressed -----
+

=== modified file 'tests/test_bounces.py'
--- a/tests/test_bounces.py     2007-11-12 05:40:15 +0000
+++ b/tests/test_bounces.py     2008-06-15 04:30:07 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2008 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
@@ -72,6 +72,7 @@
         ('SimpleWarning', 'simple_03.txt', Stop),
         ('SimpleWarning', 'simple_21.txt', Stop),
         ('SimpleWarning', 'simple_22.txt', Stop),
+        ('SimpleWarning', 'simple_28.txt', Stop),
         # GroupWise
         ('GroupWise', 'groupwise_01.txt', ['[EMAIL PROTECTED]']),
         # This one really sucks 'cause it's text/html.  Just make sure it



--
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

Reply via email to