9 files changed, 32 insertions, 24 deletions

diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index c2f0610a4..ed2349980 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -18,7 +18,6 @@
 
 """
 
-import sys
 import os
 import cgi
 import string
@@ -31,6 +30,8 @@ from Mailman import MailCommandHandler
 from Mailman.htmlformat import *
 from Mailman.Crypt import crypt
 from Mailman import mm_cfg
+from Mailman.Logging.Syslog import syslog
+
 
 CATEGORIES = [('general', "General Options"),
               ('members', "Membership Management"),
@@ -67,11 +68,10 @@ def main():
     try: 
         mlist = MailList.MailList(listname)
     except Errors.MMListError, e:
-            FormatAdminOverview('No such list <em>%s</em>' % listname)
-            sys.stderr.write(
-                'Someone tried to access the admin interface for a '
-                'non-existent list: %s\n' % listname)
-            return
+        FormatAdminOverview('No such list <em>%s</em>' % listname)
+        syslog('Someone tried to access the admin interface for a '
+               'non-existent list: %s\n' % listname)
+        return
     try:
         if len(parts) == 1:
             category = 'general'
@@ -378,7 +378,7 @@ def AddOptionsTableItem(table, item, category, mlist, detailsp=1):
 	got = GetItemCharacteristics(item)
 	varname, kind, params, dependancies, descr, elaboration = got
     except ValueError, msg:
-        mlist.LogMsg("error", "admin: %s", msg)
+        syslog('error', 'admin: %s' % msg)
         return Italic("<malformed option>")
     descr = GetItemGuiDescr(mlist, category, varname, descr, detailsp)
     val = GetItemGuiValue(mlist, kind, varname, params)
@@ -821,8 +821,6 @@ def ChangeOptions(mlist, category, cgi_info, document):
             if cgi_info.has_key(property+'_upload') and \
                    cgi_info[property+'_upload'].value:
                 val = cgi_info[property+'_upload'].value
-##                mlist.LogMsg('debug', 'got ' + property+'_upload: ' +
-##                             string.replace(val, '%', '%%'))
             elif not cgi_info.has_key(property):
                 if (kind <> mm_cfg.Text and 
                     kind <> mm_cfg.String and 
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py
index ea5d3303e..d4930051a 100644
--- a/Mailman/Cgi/admindb.py
+++ b/Mailman/Cgi/admindb.py
@@ -17,7 +17,6 @@
 """Produce and process the pending-approval items for a list."""
 
 import os
-import sys
 import string
 import types
 import cgi
@@ -28,6 +27,7 @@ from Mailman import Utils
 from Mailman import MailList
 from Mailman import Errors
 from Mailman.htmlformat import *
+from Mailman.Logging.Syslog import syslog
 
 
 
@@ -65,7 +65,7 @@ def main():
         mlist = MailList.MailList(listname)
     except Errors.MMListError, e:
         handle_no_list(doc, 'No such list <em>%s</em><p>' % listname)
-        sys.stderr.write('No such list "%s": %s\n' % (listname, e))
+        syslog('No such list "%s": %s\n' % (listname, e))
         return
     #
     # now we must authorize the user to view this page, and if they are, to
diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py
index 70c5da036..dbcca8788 100644
--- a/Mailman/Cgi/edithtml.py
+++ b/Mailman/Cgi/edithtml.py
@@ -16,7 +16,6 @@
 
 """Script which implements admin editing of the list's html templates."""
 
-import sys
 import os
 import cgi
 import string
@@ -26,6 +25,7 @@ from Mailman import MailList
 from Mailman.htmlformat import *
 from Mailman.HTMLFormatter import HTMLFormatter
 from Mailman import Errors
+from Mailman.Logging.Syslog import syslog
 
 
 
@@ -53,7 +53,7 @@ def main():
     except Errors.MMListError, e:
         doc.AddItem(Header(2, 'No such list <em>%s</em>' % listname))
         print doc.Format(bgcolor='#ffffff')
-        sys.stderr.write('No such list "%s": %s\n' % (listname, e))
+        syslog('No such list "%s": %s\n' % (listname, e))
         return
 
     # get the list._template_dir attribute
diff --git a/Mailman/Cgi/handle_opts.py b/Mailman/Cgi/handle_opts.py
index afaa32da4..dd55be1b0 100644
--- a/Mailman/Cgi/handle_opts.py
+++ b/Mailman/Cgi/handle_opts.py
@@ -26,6 +26,7 @@ from Mailman import Utils
 from Mailman import MailList
 from Mailman import Errors
 from Mailman.htmlformat import *
+from Mailman.Logging.Syslog import syslog
 
 
 
@@ -71,7 +72,7 @@ def main():
         doc.AddItem(Header(2, "Error"))
         doc.AddItem(Bold('No such list <em>%s</em>' % listname))
         print doc.Format(bgcolor="#ffffff")
-        sys.stderr.write('No such list "%s": %s\n' % (listname, e))
+        syslog('No such list "%s": %s\n' % (listname, e))
         return
 
     try:
diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py
index 17db20d62..a4249cbb0 100644
--- a/Mailman/Cgi/listinfo.py
+++ b/Mailman/Cgi/listinfo.py
@@ -19,7 +19,6 @@
 
 # No lock needed in this script, because we don't change data.
 
-import sys
 import os
 import string
 
@@ -28,6 +27,7 @@ from Mailman import Utils
 from Mailman import MailList
 from Mailman import Errors
 from Mailman.htmlformat import *
+from Mailman.Logging.Syslog import syslog
 
 
 
@@ -48,7 +48,7 @@ def main():
         mlist = MailList.MailList(listname, lock=0)
     except Errors.MMListError, e:
         FormatListinfoOverview('No such list <em>%s</em>' % listname)
-        sys.stderr.write('No such list "%s": %s\n' % (listname, e))
+        syslog('No such list "%s": %s\n' % (listname, e))
         return
 
     FormatListListinfo(mlist)
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py
index 3fc5faa1e..a47a74af9 100644
--- a/Mailman/Cgi/options.py
+++ b/Mailman/Cgi/options.py
@@ -25,7 +25,6 @@ unobscured ids as well.
 # We don't need to lock in this script, because we're never going to change
 # data. 
 
-import sys
 import os
 import string
 
@@ -34,6 +33,7 @@ from Mailman import Utils
 from Mailman import MailList
 from Mailman import Errors
 from Mailman.htmlformat import *
+from Mailman.Logging.Syslog import syslog
 
 
 
@@ -62,7 +62,7 @@ def main():
         doc.AddItem(Header(2, "Error"))
         doc.AddItem(Bold('No such list <em>%s</em>' % listname))
         print doc.Format()
-        sys.stderr.write('No such list "%s": %s\n' % (listname, e))
+        syslog('No such list "%s": %s\n' % (listname, e))
         return
 
     # Sanity check the user
diff --git a/Mailman/Cgi/private.py b/Mailman/Cgi/private.py
index 750e2d8bd..0738936d3 100644
--- a/Mailman/Cgi/private.py
+++ b/Mailman/Cgi/private.py
@@ -25,6 +25,7 @@ from Mailman import Utils, MailList, Errors
 from Mailman.htmlformat import *
 from Mailman.Logging.Utils import LogStdErr
 from Mailman import mm_cfg
+from Mailman.Logging.Syslog import syslog
 
 LogStdErr("error", "private")
 
@@ -124,7 +125,7 @@ def main():
         doc.SetTitle("Private Archive Error - %s" % msg)
         doc.AddItem(Header(2, msg))
         print doc.Format(bgcolor="#FFFFFF")
-        sys.stderr.write('No such list "%s": %s\n' % (listname, e))
+        syslog('No such list "%s": %s\n' % (listname, e))
         sys.exit(0)
 
     form = cgi.FieldStorage()
diff --git a/Mailman/Cgi/roster.py b/Mailman/Cgi/roster.py
index cdb9dfbcb..b893de913 100644
--- a/Mailman/Cgi/roster.py
+++ b/Mailman/Cgi/roster.py
@@ -26,8 +26,15 @@ Takes listname in PATH_INFO.
 import sys
 import os, string
 import cgi
-from Mailman import Utils, MailList, htmlformat, Errors
 
+from Mailman import Utils
+from Mailman import MailList
+from Mailman import htmlformat
+from Mailman import Errors
+from Mailman.Logging.Syslog import syslog
+
+
+
 def main():
     doc = htmlformat.HeadlessDocument()
     form = cgi.FieldStorage()
@@ -93,7 +100,7 @@ def get_list():
         mlist.IsListInitialized()
     except Errors.MMListError, e:
         error_page('No such list <em>%s</em>' % listname)
-        sys.stderr.write('No such list "%s": %s\n' % (listname, e))
+        syslog('No such list "%s": %s\n' % (listname, e))
         sys.exit(0)
     return mlist
 
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py
index 9c966fce0..d642fef2e 100644
--- a/Mailman/Cgi/subscribe.py
+++ b/Mailman/Cgi/subscribe.py
@@ -26,6 +26,7 @@ from Mailman import MailList
 from Mailman import Errors
 from Mailman.htmlformat import *
 from Mailman import mm_cfg
+from Mailman.Logging.Syslog import syslog
 
 
 
@@ -54,7 +55,7 @@ def main():
         doc.AddItem(Header(2, "Error"))
         doc.AddItem(Bold('No such list <em>%s</em>' % listname))
         print doc.Format(bgcolor="#ffffff")
-        sys.stderr.write('No such list "%s": %s\n' % (listname, e))
+        syslog('No such list "%s": %s\n' % (listname, e))
         return
     try:
         process_form(mlist, doc)
@@ -130,8 +131,8 @@ def process_form(mlist, doc):
         else:
             remote = "unidentified origin"
         badremote = "\n\tfrom " + remote
-        mlist.LogMsg("mischief", ("Attempt to self subscribe %s:%s"
-                                 % (email, badremote)))
+        syslog("mischief", "Attempt to self subscribe %s:%s"
+               % (email, badremote))
         results = results + "You must not subscribe a list to itself!<br>"
 
     if not form.has_key("pw") or not form.has_key("pw-conf"):