------------------------------------------------------------
revno: 1442
fixes bug: https://launchpad.net/bugs/1263247
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Fri 2013-12-20 15:45:28 -0800
message:
Added recognition for a kundenserver.de warning to simplewarning.py
added:
tests/bounces/simple_40.txt
modified:
Mailman/Bouncers/SimpleWarning.py
NEWS
tests/onebounce.py
tests/test_bounces.py
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Bouncers/SimpleWarning.py'
--- Mailman/Bouncers/SimpleWarning.py 2009-02-20 22:22:04 +0000
+++ Mailman/Bouncers/SimpleWarning.py 2013-12-20 23:45:28 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
@@ -57,6 +57,10 @@
(_c('We will continue to try to deliver'),
_c('.+'),
_c('(?P<addr>.+)')),
+ # kundenserver.de
+ (_c('not yet been delivered'),
+ _c('No action is required on your part'),
+ _c(r'\s*<?(?P<addr>\S+@[^>\s]+)>?\s*')),
# Next one goes here...
]
=== modified file 'NEWS'
--- NEWS 2013-12-20 02:30:55 +0000
+++ NEWS 2013-12-20 23:45:28 +0000
@@ -9,6 +9,9 @@
Bug Fixes and other patches
+ - Added recognition for another simple warning to bounce processing.
+ (LP: #1263247)
+
- Fixed a few failing tests in tests/test_handlers.py. (LP: #1262950)
- Fixed bin/arch to not create scrubbed attachments for messages skipped
=== added file 'tests/bounces/simple_40.txt'
--- tests/bounces/simple_40.txt 1970-01-01 00:00:00 +0000
+++ tests/bounces/simple_40.txt 2013-12-20 23:45:28 +0000
@@ -0,0 +1,29 @@
+Return-Path: <>
+Received: from mout by moeu2.kundenserver.de id 0LkyaB-1VJZRH2iiz-00ahag;
+ Fri, 13 Dec 2013 01:07:54 +0100
+Date: Fri, 13 Dec 2013 01:07:54 +0100
+From: Mail Delivery System <mailer-dae...@kundenserver.de>
+To: mailman-users-bounces+user=example....@python.org
+Subject: Warning: message delayed 2 days
+Message-Id: <0lkyab-1vjzrh2iiz-00a...@moeu2.kundenserver.de>
+X-Original-Id: 0LykMh-1VSY0J0JZn-015ri8
+
+This message was created automatically by mail delivery software.
+
+A message that you sent has not yet been delivered to one or more of
+its recipients after 2 days.
+
+The message has not yet been delivered to the following addresses:
+
+ <u...@example.com>
+
+host lsvk.de[213.165.78.137]:
+connection to mail exchanger failed
+
+No action is required on your part. Delivery attempts will continue for
+some time, and this warning may be repeated at intervals if the message
+remains undelivered. Eventually the mail delivery software will give up,
+and when that happens, the message will be returned to you.
+
+--- The header of the original message is following. ---
+
=== modified file 'tests/onebounce.py'
--- tests/onebounce.py 2005-08-27 01:40:17 +0000
+++ tests/onebounce.py 2013-12-20 23:45:28 +0000
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-# Copyright (C) 2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 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
@@ -14,7 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
"""Test the bounce detection for files containing bounces.
@@ -80,6 +81,7 @@
print module, 'got a Stop'
if not all:
break
+ continue
if not addrs:
if verbose:
print module, 'found no matches'
=== modified file 'tests/test_bounces.py'
--- tests/test_bounces.py 2013-05-31 02:29:33 +0000
+++ tests/test_bounces.py 2013-12-20 23:45:28 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
@@ -89,6 +89,7 @@
('SimpleWarning', 'simple_22.txt', Stop),
('SimpleWarning', 'simple_28.txt', Stop),
('SimpleWarning', 'simple_35.txt', Stop),
+ ('SimpleWarning', 'simple_40.txt', Stop),
# GroupWise
('GroupWise', 'groupwise_01.txt', ['th...@mainex1.asu.edu']),
# This one really sucks 'cause it's text/html. Just make sure it
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
