Use better syslog() calling convention.

4 files changed, 51 insertions, 54 deletions

diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index 786e4fea0..9d1abf46f 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -122,7 +122,7 @@ class Bouncer:
             # No (or expired) priors - new record.
             self.bounce_info[email.lower()] = [now, self.post_id,
                                                self.post_id]
-            syslog("bounce", report + "first")
+            syslog('bounce', '%sfirst', report)
             dirty = 1
             return
 
@@ -135,7 +135,7 @@ class Bouncer:
                 # There's been enough posts since last bounce that we're
                 # restarting.  (Might should keep track of who goes stale
                 # how often.)
-                syslog("bounce", report + "first fresh")
+                syslog('bounce', '%sfirst fresh', report)
                 self.bounce_info[addr] = [now, self.post_id, self.post_id]
                 dirty = 1
                 return
@@ -145,7 +145,7 @@ class Bouncer:
                  self.minimum_post_count_before_bounce_action)
                 and
                 (difference > self.minimum_removal_date * secs_per_day)):
-                syslog("bounce", report + "exceeded limits")
+                syslog('bounce', '%sexceeded limits', report)
                 self.HandleBouncingAddress(addr, msg)
                 return
             else:
@@ -155,24 +155,23 @@ class Bouncer:
                     post_count = 0
                 remain = (self.minimum_removal_date
                           * secs_per_day - difference)
-                syslog("bounce", report + ("%d more allowed over %d secs"
-                                           % (post_count, remain)))
+                syslog('bounce', '%s%d more allowed over %d secs',
+                       report, post_count, remain)
                 return
 
         elif len(Utils.FindMatchingAddresses(addr, self.digest_members)):
             if self.volume > hist[1]:
-                syslog("bounce", "%s: first fresh (D)" %
-                       self._internal_name)
+                syslog('bounce', '%s: first fresh (D)', self._internal_name)
                 self.bounce_info[addr] = [now, self.volume, self.volume]
                 return
             if difference > self.minimum_removal_date * secs_per_day:
-                syslog("bounce", report + "exceeded limits (D)")
+                syslog('bounce', '%sexceeded limits (D)', report)
                 self.HandleBouncingAddress(addr, msg)
                 return 
-            syslog("bounce", report + "digester lucked out")
+            syslog('bounce', '%sdigester lucked out', report)
         else:
-            syslog("bounce", "%s: address %s not a member." %
-                   (self.internal_name(), addr))
+            syslog('bounce', '%s: address %s not a member.',
+                   self.internal_name(), addr)
 
     def HandleBouncingAddress(self, addr, msg):
         """Disable or remove addr according to bounce_action setting."""
@@ -205,12 +204,10 @@ class Bouncer:
                 # Whoops!  This is a bounce of a bounce notice - do not
                 # perpetuate the bounce loop!  Log it prominently and be
                 # satisfied with that.
-                syslog("error",
-                       "%s: Bounce recipient loop"
-                       " encountered!\n\t%s\n\tBad admin recipient: %s" %
-                       (self.internal_name(),
-                        "(Ie, bounce notification addr, itself, bounces.)",
-                        addr))
+                syslog('error', '''\
+%s: Bounce recipient loop encountered!
+(I.e., bounce notification address itself bounces.)
+Bad admin recipient: %s''', self.internal_name(), addr)
                 return
             import mimetools
             boundary = mimetools.choose_boundary()
@@ -280,23 +277,23 @@ class Bouncer:
         """
         if not self.IsMember(addr):
             reason = _('User not found.')
-            syslog("bounce", "%s: NOT disabled %s: %s" %
-                   (self.real_name, addr, reason))
+            syslog('bounce', '%s: NOT disabled %s: %s',
+                   self.real_name, addr, reason)
             return reason, 1
         try:
             if self.GetUserOption(addr, mm_cfg.DisableDelivery):
                 # No need to send out notification if they're already disabled.
-                syslog("bounce", "%s: already disabled %s" %
-                       (self.real_name, addr))
+                syslog('bounce', '%s: already disabled %s' %
+                       self.real_name, addr)
                 return 1, 0
             else:
                 self.SetUserOption(addr, mm_cfg.DisableDelivery, 1)
-                syslog("bounce", "%s: disabled %s" % (self.real_name, addr))
+                syslog('bounce', '%s: disabled %s', self.real_name, addr)
                 self.Save()
                 return 1, 1
         except Errors.MMNoSuchUserError:
-            syslog("bounce", "%s: NOT disabled %s: %s" %
-                   (self.real_name, addr, Errors.MMNoSuchUserError))
+            syslog('bounce', '%s: NOT disabled %s: %s',
+                   self.real_name, addr, Errors.MMNoSuchUserError)
             self.ClearBounceInfo(addr)
             self.Save()
             return Errors.MMNoSuchUserError, 1
@@ -307,17 +304,17 @@ class Bouncer:
         Returning success and notification status."""
         if not self.IsMember(addr):
             reason = _('User not found.')
-            syslog("bounce", "%s: NOT removed %s: %s" %
-                   (self.real_name, addr, reason))
+            syslog('bounce', '%s: NOT removed %s: %s',
+                   self.real_name, addr, reason)
             return reason, 1
         try:
             self.DeleteMember(addr, "bouncing addr")
-            syslog("bounce", "%s: removed %s" % (self.real_name, addr))
+            syslog('bounce', '%s: removed %s', self.real_name, addr)
             self.Save()
             return 1, 1
         except Errors.MMNoSuchUserError:
-            syslog("bounce", "%s: NOT removed %s: %s" %
-                   (self.real_name, addr, Errors.MMNoSuchUserError))
+            syslog('bounce', '%s: NOT removed %s: %s',
+                   self.real_name, addr, Errors.MMNoSuchUserError)
             self.ClearBounceInfo(addr)
             self.Save()
             return Errors.MMNoSuchUserError, 1
diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py
index 159fd9073..e0624c8e4 100644
--- a/Mailman/ListAdmin.py
+++ b/Mailman/ListAdmin.py
@@ -27,6 +27,7 @@ import os
 import time
 import marshal
 import errno
+
 from mimelib.Generator import Generator
 from mimelib.Parser import Parser
 
@@ -221,7 +222,7 @@ class ListAdmin:
             # Queue the file for delivery by qrunner.  Trying to deliver the
             # message directly here can lead to a huge delay in web
             # turnaround.
-            syslog('vette', 'approved held message enqueued: %s' % filename)
+            syslog('vette', 'approved held message enqueued: %s', filename)
             # Stick the message back in the incoming queue for further
             # processing.
             inq = get_switchboard(mm_cfg.INQUEUE_DIR)
@@ -313,8 +314,8 @@ class ListAdmin:
         #
         # TBD: this really shouldn't go here but I'm not sure where else is
         # appropriate.
-        syslog('vette', '%s: held subscription request from %s' %
-               (self.real_name, addr))
+        syslog('vette', '%s: held subscription request from %s',
+               self.real_name, addr)
         # possibly notify the administrator in default list language
         if self.admin_immed_notify:
             realname = self.real_name
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index b4898ced1..2b219f35a 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -27,9 +27,9 @@ import errno
 import re
 import shutil
 import socket
-from types import StringType, IntType, DictType, ListType
 import urllib
 from urlparse import urlparse
+from types import *
 
 from mimelib.address import getaddresses
 
@@ -49,12 +49,12 @@ from Mailman.SecurityManager import SecurityManager
 from Mailman.Bouncer import Bouncer
 from Mailman.GatewayManager import GatewayManager
 from Mailman.Autoresponder import Autoresponder
-from Mailman.Logging.Syslog import syslog
 
 # other useful classes
 from Mailman import Message
 from Mailman import Pending
 from Mailman.i18n import _
+from Mailman.Logging.Syslog import syslog
 from Mailman.pythonlib.StringIO import StringIO
 
 EMPTYSTRING = ''
@@ -905,7 +905,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
             fp.close()
         except IOError, e:
             syslog('error',
-                   'Failed config.db write, retaining old state.\n%s' % e)
+                   'Failed config.db write, retaining old state.\n%s', e)
             if fp is not None:
                 os.unlink(fname_tmp)
             raise
@@ -981,13 +981,13 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
         if dict is None:
             # Had problems with config.db.  Either it's missing or it's
             # corrupted.  Try config.db.last as a fallback.
-            syslog('error', '%s db file was corrupt, using fallback: %s'
-                   % (self.internal_name(), lastfile))
+            syslog('error', '%s db file was corrupt, using fallback: %s',
+                   self.internal_name(), lastfile)
             dict, e = self.__load(lastfile)
             if dict is None:
                 # config.db.last is busted too.  Nothing much we can do now.
-                syslog('error', '%s fallback was corrupt, giving up'
-                       % self.internal_name())
+                syslog('error', '%s fallback was corrupt, giving up',
+                       self.internal_name())
                 raise Errors.MMCorruptListDatabaseError, e
             # We had to read config.db.last, so copy it back to config.db.
             # This allows the logic in Save() to remain unchanged.  Ignore
@@ -1101,8 +1101,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
             if recipient != name:
                 who = "%s (%s)" % (name, recipient.split('@')[0])
             else: who = name
-            syslog('subscribe', '%s: pending %s %s' %
-                   (self.internal_name(), who, by))
+            syslog('subscribe', '%s: pending %s %s',
+                   self.internal_name(), who, by)
             raise Errors.MMSubscribeNeedsConfirmation
         else:
             # subscription approval is required.  add this entry to the admin
@@ -1304,8 +1304,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
                 kind = ""
             for name in result.keys():
                 if result[name] is None:
-                    syslog('subscribe', '%s: new%s %s' %
-                           (self.internal_name(), kind, name))
+                    syslog('subscribe', '%s: new%s %s',
+                           self.internal_name(), kind, name)
                     if ack:
                         self.SendSubscribeAck(
                             name,
@@ -1381,8 +1381,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
             whence = "; %s" % whence
         else:
             whence = ""
-        syslog('subscribe', '%s: deleted %s%s' %
-               (self.internal_name(), name, whence))
+        syslog('subscribe', '%s: deleted %s%s',
+               self.internal_name(), name, whence)
 
     def ApprovedChangeMemberAddress(self, oldaddr, newaddr, globally):
         # Get the user's current options and password.  Ugly hack: if a user's
@@ -1504,8 +1504,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
             if i < 0:
                 # This didn't look like a header line.  BAW: should do a
                 # better job of informing the list admin.
-                syslog('config', 'bad bounce_matching_header line: %s\n%s'
-                       % (self.real_name, line))
+                syslog('config', 'bad bounce_matching_header line: %s\n%s',
+                       self.real_name, line)
             else:
                 header = line[:i]
                 value = line[i+1:].lstrip()
@@ -1514,10 +1514,9 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
                 except re.error, e:
                     # The regexp was malformed.  BAW: should do a better
                     # job of informing the list admin.
-                    syslog('config',
-                           'bad regexp in bounce_matching_header line: %s'
-                           '\n%s (cause: %s)' %
-                           (self.real_name, value, e))
+                    syslog('config', '''\
+bad regexp in bounce_matching_header line: %s
+\n%s (cause: %s)''', self.real_name, value, e)
                 else:
                     all.append((header, cre, line))
         return all
diff --git a/Mailman/versions.py b/Mailman/versions.py
index b9e5bfa1d..5bdb41410 100644
--- a/Mailman/versions.py
+++ b/Mailman/versions.py
@@ -270,6 +270,6 @@ def NewRequestsDatabase(l):
                 l.HoldSubscription(addr, password, digest)
             del r[k]
         else:
-            syslog('error',
-                   "VERY BAD NEWS.  Unknown pending request type `%s' found"
-                   ' for list: %s' % (k, l.internal_name()))
+            syslog('error', """\
+VERY BAD NEWS.  Unknown pending request type `%s' found for list: %s""",
+                   k, l.internal_name())