diff options
| author | klm | 1998-04-10 20:11:55 +0000 |
|---|---|---|
| committer | klm | 1998-04-10 20:11:55 +0000 |
| commit | 60c190a5e853c439bf55109b9b1a876334f8dbdc (patch) | |
| tree | 08cc540c7c97a17aadcb003dbf2fb7aa421e4f5b /modules/mm_bouncer.py | |
| parent | 00953f5383ee3e3c0976e84774d2c1f8f1d0fec1 (diff) | |
| download | mailman-60c190a5e853c439bf55109b9b1a876334f8dbdc.tar.gz mailman-60c190a5e853c439bf55109b9b1a876334f8dbdc.tar.zst mailman-60c190a5e853c439bf55109b9b1a876334f8dbdc.zip | |
.RegisterBounce(): Missing '%' was making a string format operation
look like an erroneous application of a non-existent function.
Minor spelling change - "relevent_text" => "relevant_text".
Diffstat (limited to 'modules/mm_bouncer.py')
| -rw-r--r-- | modules/mm_bouncer.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/modules/mm_bouncer.py b/modules/mm_bouncer.py index 7d2bbfc36..7063a1bc6 100644 --- a/modules/mm_bouncer.py +++ b/modules/mm_bouncer.py @@ -1,6 +1,6 @@ "Handle delivery bounce messages, doing filtering when list is set for it." -__version__ = "$Revision: 394 $" +__version__ = "$Revision: 418 $" # It's possible to get the mail-list senders address (list-admin) in the # bounce list. You probably don't want to have list mail sent to that @@ -92,11 +92,10 @@ class Bouncer: self.post_id - inf[1]) if post_count < 0: post_count = 0 + remain = self.minimum_removal_date * 24 * 60 * 60 - difference self.LogMsg("bounce", - (report + ("%d more posts, %d more secs" - (post_count, - (self.minimum_removal_date - * 24 * 60 * 60 - difference))))) + report + ("%d more posts, %d more secs" + % (post_count, remain))) self.Save() return @@ -228,16 +227,16 @@ class Bouncer: '"[^"]+"')[1][1:-1] if boundry: - relevent_text = string.split(msg.body, '--%s' % boundry)[1] + relevant_text = string.split(msg.body, '--%s' % boundry)[1] else: # This looks strange, but at least 2 are going to be no-ops. - relevent_text = regsub.split(msg.body, + relevant_text = regsub.split(msg.body, '^.*Message header follows.*$')[0] - relevent_text = regsub.split(relevent_text, + relevant_text = regsub.split(relevant_text, '^The text you sent follows:.*$')[0] - relevent_text = regsub.split( - relevent_text, '^Additional Message Information:.*$')[0] - relevent_text = regsub.split(relevent_text, + relevant_text = regsub.split( + relevant_text, '^Additional Message Information:.*$')[0] + relevant_text = regsub.split(relevant_text, '^-+Your original message-+.*$')[0] BOUNCE = 1 @@ -268,7 +267,7 @@ class Bouncer: message_groked = 0 did = [] - for line in string.split(relevent_text, '\n'): + for line in string.split(relevant_text, '\n'): for pattern, action in simple_bounce_pats: if pattern.match(line) <> -1: email = self.ExtractBouncingAddr(line) |