From 58bff6c7efc5af4f3751a7bdced4ec86e708d714 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Sat, 29 Dec 2001 21:08:04 +0000
Subject: patterns: Python 2.2 is more strict about duplicate group names in
 regular expressions.

---
 Mailman/Bouncers/SimpleMatch.py | 4 ++--
 1 file 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.'),
-- 
cgit v1.3.1