aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2013-05-30 19:29:33 -0700
committerMark Sapiro <mark@msapiro.net>2013-05-30 19:29:33 -0700
commit41072c693aa53a0072963119c8cf7919096eaad5 (patch)
tree7b3eb38d7a88ca62fd231e8ae18294e0cc14bd47 /Mailman
parentf79f7cfd78e421c27771291c2bd2ecee6fc1d90c (diff)
downloadmailman2-41072c693aa53a0072963119c8cf7919096eaad5.tar.gz
mailman2-41072c693aa53a0072963119c8cf7919096eaad5.tar.xz
mailman2-41072c693aa53a0072963119c8cf7919096eaad5.zip
Backported fixes for lp:1074592, lp:1079249 and lp:1079254 from
lp:flufl.bounce. Actually, lp:1074592 doesn't affect MM 2, but I included the test case.
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Bouncers/SimpleMatch.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py
index 0607ce86..2aa082a2 100644
--- a/Mailman/Bouncers/SimpleMatch.py
+++ b/Mailman/Bouncers/SimpleMatch.py
@@ -42,7 +42,7 @@ PATTERNS = [
# sz-sb.de, corridor.com, nfg.nl
(_c('the following addresses had'),
_c('transcript of session follows'),
- _c(r'<(?P<fulladdr>[^>]*)>|\(expanded from: <?(?P<addr>[^>)]*)>?\)')),
+ _c(r'^ *(\(expanded from: )?<?(?P<addr>[^\s@]+@[^\s@>]+?)>?\)?\s*$')),
# robanal.demon.co.uk
(_c('this message was created automatically by mail delivery software'),
_c('original message follows'),
@@ -184,6 +184,10 @@ PATTERNS = [
_c(
'Your message to (?P<addr>[^\s@]+@[^\s@]+) was automatically rejected'
)),
+ # mail.ru
+ (_c('A message that you sent was rejected'),
+ _c('This is a copy of your message'),
+ _c('\s(?P<addr>[^\s@]+@[^\s@]+)')),
# Next one goes here...
]