From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 31 Mar 2005 20:11:45 +0000 (+0000)
Subject: Minor changes to imports
X-Git-Tag: v2.4.2c1~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d6fe25689ea79802cd9657b4a686362f4ed7e89;p=thirdparty%2FPython%2Fcpython.git

Minor changes to imports
---

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 92f2af0abb81..ea157db5bfc5 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -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 @@ Copyright (C) 2001-2004 Vinay Sajip. All Rights Reserved.
 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 @@ def fileConfig(fname, defaults=None):
             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