[Python-checkins] python/dist/src/Lib/logging config.py,1.11,1.12

vsajip at users.sourceforge.net vsajip at users.sourceforge.net
Sun Mar 13 10:57:49 CET 2005


Update of /cvsroot/python/python/dist/src/Lib/logging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30814

Modified Files:
	config.py 
Log Message:
Made traceback unconditional, to avoid lock contention problems when logging errors occur in a custom importer (SF path #1158052).

Index: config.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/logging/config.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config.py	18 Feb 2005 11:54:46 -0000	1.11
+++ config.py	13 Mar 2005 09:57:46 -0000	1.12
@@ -1,4 +1,4 @@
-# Copyright 2001-2004 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2005 by Vinay Sajip. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and its
 # documentation for any purpose and without fee is hereby granted,
@@ -27,7 +27,7 @@
 To use, simply 'import logging' and log away!
 """
 
-import sys, logging, logging.handlers, string, socket, struct, os
+import sys, logging, logging.handlers, string, socket, struct, os, traceback
 
 try:
     import thread
@@ -195,7 +195,6 @@
             for log in existing:
                 root.manager.loggerDict[log].disabled = 1
         except:
-            import traceback
             ei = sys.exc_info()
             traceback.print_exception(ei[0], ei[1], ei[2], None, sys.stderr)
             del ei



More information about the Python-checkins mailing list