diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Bouncers/SimpleMatch.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py index a6a952a2..1c88d5ac 100644 --- a/Mailman/Bouncers/SimpleMatch.py +++ b/Mailman/Bouncers/SimpleMatch.py @@ -174,6 +174,10 @@ PATTERNS = [ (_c('Could not deliver message to'), _c('^\s*--'), _c('^Failed Recipient:\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')), + # uci.edu + (_c('--------Message not delivered'), + _c('--------Error Detail'), + _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')), # Next one goes here... ] @@ -195,7 +199,7 @@ def process(msg, patterns=None): # we process the message multiple times anyway. for scre, ecre, acre in patterns: state = 0 - for line in email.Iterators.body_line_iterator(msg): + for line in email.Iterators.body_line_iterator(msg, decode=True): if state == 0: if scre.search(line): state = 1 |