diff options
| author | bwarsaw | 2001-12-29 21:08:04 +0000 |
|---|---|---|
| committer | bwarsaw | 2001-12-29 21:08:04 +0000 |
| commit | 58bff6c7efc5af4f3751a7bdced4ec86e708d714 (patch) | |
| tree | ddca9dc21c4741ff6c429c066e5f6f3088344842 | |
| parent | 13811beb35965b1673edb3b3084077f50efe0485 (diff) | |
| download | mailman-58bff6c7efc5af4f3751a7bdced4ec86e708d714.tar.gz mailman-58bff6c7efc5af4f3751a7bdced4ec86e708d714.tar.zst mailman-58bff6c7efc5af4f3751a7bdced4ec86e708d714.zip | |
patterns: Python 2.2 is more strict about duplicate group names in
regular expressions.
| -rw-r--r-- | Mailman/Bouncers/SimpleMatch.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py index 3daa4925f..7b6fc1dea 100644 --- a/Mailman/Bouncers/SimpleMatch.py +++ b/Mailman/Bouncers/SimpleMatch.py @@ -41,7 +41,7 @@ patterns = [ # sz-sb.de, corridor.com, nfg.nl (_c('the following addresses had'), _c('transcript of session follows'), - _c(r'<(?P<addr>[^>]*)>|\(expanded from: (?P<addr>[^)]*)\)')), + _c(r'<(?P<fulladdr>[^>]*)>|\(expanded from: (?P<addr>[^)]*)\)')), # robanal.demon.co.uk (_c('this message was created automatically by mail delivery software'), _c('original message follows'), @@ -53,7 +53,7 @@ patterns = [ # Smail (_c('failed addresses follow:'), _c('message text follows:'), - _c('<(?P<addr>[^>]*)>|\s*(?P<addr>\S+@\S+)')), + _c(r'\s*(?P<addr>\S+@\S+)')), # newmail.ru (_c('This is the machine generated message from mail service.'), _c('--- Below the next line is a copy of the message.'), |