diff options
Diffstat (limited to 'Mailman/Handlers')
| -rw-r--r-- | Mailman/Handlers/Decorate.py | 3 | ||||
| -rw-r--r-- | Mailman/Handlers/Hold.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/Sendmail.py | 10 | ||||
| -rw-r--r-- | Mailman/Handlers/ToUsenet.py | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py index 8a2a30f9e..90a3cd509 100644 --- a/Mailman/Handlers/Decorate.py +++ b/Mailman/Handlers/Decorate.py @@ -76,8 +76,7 @@ def decorate(mlist, template, what): try: text = (template % d).replace('\r\n', '\n') except ValueError, e: - syslog('error', 'Exception while calculating %s:\n%s' % - (what, e)) + syslog('error', 'Exception while calculating %s:\n%s', what, e) what = what.upper() text = _('[INVALID %(what)s]') return text diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py index d9a57db82..a610c822b 100644 --- a/Mailman/Handlers/Hold.py +++ b/Mailman/Handlers/Hold.py @@ -279,7 +279,7 @@ def hold_for_approval(mlist, msg, msgdata, exc): finally: i18n.set_translation(otranslation) # Log the held message - syslog('vette', '%s post from %s held: %s' % (listname, sender, reason)) + syslog('vette', '%s post from %s held: %s', listname, sender, reason) # raise the specific MessageHeld exception to exit out of the message # delivery pipeline raise exc diff --git a/Mailman/Handlers/Sendmail.py b/Mailman/Handlers/Sendmail.py index 235a2b0e1..fbec8c69a 100644 --- a/Mailman/Handlers/Sendmail.py +++ b/Mailman/Handlers/Sendmail.py @@ -87,15 +87,15 @@ def process(mlist, msg, msgdata): status = fp.close() if status: errcode = (status & 0xff00) >> 8 - syslog('post', 'post to %s from %s, size=%d, failure=%d' % - (mlist.internal_name(), msg.get_sender(), - len(msg.body), errcode)) + syslog('post', 'post to %s from %s, size=%d, failure=%d', + mlist.internal_name(), msg.get_sender(), + len(msg.body), errcode) # TBD: can we do better than this? What if only one recipient out # of the entire chunk failed? failedrecips.append(chunk) # Log the successful post - syslog('post', 'post to %s from %s, size=%d, success' % - (mlist.internal_name(), msg.get_sender(), len(msg.body))) + syslog('post', 'post to %s from %s, size=%d, success', + mlist.internal_name(), msg.get_sender(), len(msg.body)) if failedrecips: msgdata['recips'] = failedrecips raise Errors.SomeRecipientsFailed diff --git a/Mailman/Handlers/ToUsenet.py b/Mailman/Handlers/ToUsenet.py index d209e3c7c..41482872b 100644 --- a/Mailman/Handlers/ToUsenet.py +++ b/Mailman/Handlers/ToUsenet.py @@ -35,7 +35,7 @@ def process(mlist, msg, msgdata): if not mlist.nntp_host: error.append('no NNTP host') if error: - syslog('error', 'NNTP gateway improperly configured: ' + + syslog('error', 'NNTP gateway improperly configured: %s', COMMASPACE.join(error)) return # Put the message in the news runner's queue |