------------------------------------------------------------
revno: 1203
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Sun 2011-12-25 09:27:31 -0800
message:
Added recognition for another Qmail bounce.
added:
tests/bounces/qmail_07.txt
modified:
Mailman/Bouncers/Qmail.py
NEWS
tests/test_bounces.py
--
lp:mailman/2.2
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
=== modified file 'Mailman/Bouncers/Qmail.py'
--- Mailman/Bouncers/Qmail.py 2009-02-14 22:20:46 +0000
+++ Mailman/Bouncers/Qmail.py 2011-12-25 17:27:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2011 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
@@ -36,7 +36,8 @@
"We're sorry. There's a problem",
'Check your send e-mail address.',
'This is the mail delivery agent at',
- 'Unfortunately, your mail was not delivered'
+ 'Unfortunately, your mail was not delivered',
+ 'Your mail message to the following',
]
acre = re.compile(r'<(?P<addr>[^>]*)>:')
=== modified file 'NEWS'
--- NEWS 2011-12-13 01:30:54 +0000
+++ NEWS 2011-12-25 17:27:31 +0000
@@ -129,6 +129,8 @@
Bug Fixes and other patches
+ - Added recognition for another Qmail bounce format.
+
- Fixed an erroneous seek in the Mailman.Mailbox.Mailbox.AppendMessage
method that could cause a corrupt mailbox for files opened 'w+'.
Bug #901957.
=== added file 'tests/bounces/qmail_07.txt'
--- tests/bounces/qmail_07.txt 1970-01-01 00:00:00 +0000
+++ tests/bounces/qmail_07.txt 2011-12-25 17:27:31 +0000
@@ -0,0 +1,25 @@
+From nobody Sat Dec 24 16:02:20 2011
+Return-Path: <>
+X-Original-To: [email protected]
+Delivered-To: [email protected]
+Received: from p3plsmtp18-06.prod.phx3.secureserver.net
+ (p3plsmtp18-06.prod.phx3.secureserver.net [173.201.193.191])
+ by example.com (Postfix) with ESMTP id 3E97F130D75
+ for <[email protected]>;
+ Sat, 24 Dec 2011 16:02:07 -0500 (EST)
+Received: (qmail 1989 invoked for bounce); 24 Dec 2011 21:02:06 -0000
+Date: 24 Dec 2011 21:02:06 -0000
+From: [email protected]
+To: [email protected]
+Subject: failure notice
+
+Your mail message to the following address(es) could not be delivered. This
+is a permanent error. Please verify the addresses and try again. If you are
+still having difficulty sending mail to these addresses, please contact
+Customer Support at 480-624-2500.
+
+<[email protected]>:
+child status 100...The e-mail message could not be delivered because the user's mailfolder is full.
+
+--- Below this line is a copy of the message.
+
=== modified file 'tests/test_bounces.py'
--- tests/test_bounces.py 2010-12-22 16:15:17 +0000
+++ tests/test_bounces.py 2011-12-25 17:27:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2010 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2011 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
@@ -135,6 +135,7 @@
('Qmail', 'qmail_04.txt', ['[email protected]']),
('Qmail', 'qmail_05.txt', ['[email protected]']),
('Qmail', 'qmail_06.txt', ['[email protected]']),
+ ('Qmail', 'qmail_07.txt', ['[email protected]']),
# LLNL's custom Sendmail
('LLNL', 'llnl_01.txt', ['[email protected]']),
# Netscape's server...
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
