[Python-checkins] python/dist/src/Lib/logging config.py, 1.10, 1.10.2.1

[vsajip at users.sourceforge.net]

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

Modified Files:
      Tag: release24-maint
	config.py 
Log Message:
Minor changes to imports

Index: config.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/logging/config.py,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- config.py	24 Sep 2004 11:45:13 -0000	1.10
+++ config.py	31 Mar 2005 20:11:45 -0000	1.10.2.1
@@ -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,13 @@
 To use, simply 'import logging' and log away!
 """
 
-import sys, logging, logging.handlers, string, thread, threading, socket, struct, os
+import sys, logging, logging.handlers, string, socket, struct, os, traceback
+
+try:
+    import thread
+    import threading
+except ImportError:
+    thread = None
 
 from SocketServer import ThreadingTCPServer, StreamRequestHandler
 
@@ -189,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