Handle errors in imports of thread, threading

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 92f2af0abb81954c6b9a2f15f3ad5c4dc8169c6f..a5c780fe5d9494bccd9e13c77695103f6305d097 100644 (file)
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -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
+
+try:
+    import thread
+    import threading
+except ImportError:
+    thread = None
 
 from SocketServer import ThreadingTCPServer, StreamRequestHandler