diff options
| author | Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp> | 2007-11-16 11:49:31 +0900 |
|---|---|---|
| committer | Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp> | 2007-11-16 11:49:31 +0900 |
| commit | 91ece7cba085949f2f61ba9fddb02ae7dd6506ab (patch) | |
| tree | fdd5ed7bb868a44c6d31dd111a57e80f0a237ed1 /Mailman/Bouncers/SimpleWarning.py | |
| parent | 8f5d8d2eb9e8bf62a598f126419d18eb3163050e (diff) | |
| parent | f383c36db54e30c67f9bf22fc1498e9fed7b65d1 (diff) | |
| download | mailman2-91ece7cba085949f2f61ba9fddb02ae7dd6506ab.tar.gz mailman2-91ece7cba085949f2f61ba9fddb02ae7dd6506ab.tar.xz mailman2-91ece7cba085949f2f61ba9fddb02ae7dd6506ab.zip | |
merge and commit again
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Bouncers/SimpleWarning.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Mailman/Bouncers/SimpleWarning.py b/Mailman/Bouncers/SimpleWarning.py index 733994eb..45012c16 100644 --- a/Mailman/Bouncers/SimpleWarning.py +++ b/Mailman/Bouncers/SimpleWarning.py @@ -1,17 +1,17 @@ -# Copyright (C) 2001-2006 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2007 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 # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. @@ -37,6 +37,18 @@ patterns = [ (_c('The address to which the message has not yet been delivered is'), _c('No action is required on your part'), _c(r'\s*(?P<addr>\S+@\S+)\s*')), + # This is from MessageSwitch. It is a kludge because the text that + # identifies it as a warning only comes after the address. We can't + # use ecre, because it really isn't significant, so we fake it. Once + # we see the start, we know it's a warning, and we're going to return + # Stop anyway, so we match anything for the address and end. + (_c('This is just a warning, you do not need to take any action'), + _c('.+'), + _c('(?P<addr>.+)')), + # Symantec_AntiVirus_for_SMTP_Gateways - see comments for MessageSwitch + (_c('Delivery attempts will continue to be made'), + _c('.+'), + _c('(?P<addr>.+)')), # Next one goes here... ] |