Update of /cvsroot/mailman/mailman/Mailman/Logging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15990/Mailman/Logging

Modified Files:
        Logger.py Syslog.py 
Log Message:
Port cleaning changes forward from 2.1-maint branch.


Index: Logger.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Logging/Logger.py,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- Logger.py   28 Aug 2005 05:31:27 -0000      2.7
+++ Logger.py   30 Dec 2005 18:56:46 -0000      2.8
@@ -12,7 +12,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """File-based logger, writes to named category files in mm_cfg.LOG_DIR."""
 

Index: Syslog.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Logging/Syslog.py,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- Syslog.py   24 Dec 2005 01:42:18 -0000      2.5
+++ Syslog.py   30 Dec 2005 18:56:46 -0000      2.6
@@ -1,24 +1,27 @@
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Central logging class for the Mailman system.
 
 This might eventually be replaced by a syslog based logger, hence the name.
 """
 
+import quopri
+
 from Mailman.Logging.StampedLogger import StampedLogger
 
 
@@ -59,7 +62,6 @@
             logf.write(msg + '\n')
         except UnicodeError:
             # Python 2.4 may fail to write 8bit (non-ascii) characters
-            import quopri
             logf.write(quopri.encodestring(msg) + '\n')
 
     # For the ultimate in convenience

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to