[Python-checkins] r42257 - python/trunk/Lib/test/test_logging.py

[vinay.sajip]

Author: vinay.sajip
Date: Tue Feb  7 14:44:48 2006
New Revision: 42257

Modified:
   python/trunk/Lib/test/test_logging.py
Log:
Saved and restored logging._handlerList at the same time as saving/restoring logging._handlers.

Modified: python/trunk/Lib/test/test_logging.py
==============================================================================
--- python/trunk/Lib/test/test_logging.py	(original)
+++ python/trunk/Lib/test/test_logging.py	Tue Feb  7 14:44:48 2006
@@ -467,6 +467,7 @@
         sys.stdout.write('config%d: ' % i)
         loggerDict = logging.getLogger().manager.loggerDict
         saved_handlers = logging._handlers.copy()
+        saved_handler_list = logging._handlerList[:]
         saved_loggers = loggerDict.copy()
         try:
             fn = tempfile.mktemp(".ini")
@@ -484,6 +485,7 @@
         finally:
             logging._handlers.clear()
             logging._handlers.update(saved_handlers)
+            logging._handlerList = saved_handler_list
             loggerDict = logging.getLogger().manager.loggerDict
             loggerDict.clear()
             loggerDict.update(saved_loggers)
@@ -526,6 +528,7 @@
 def test5():
     loggerDict = logging.getLogger().manager.loggerDict
     saved_handlers = logging._handlers.copy()
+    saved_handler_list = logging._handlerList[:]
     saved_loggers = loggerDict.copy()
     try:
         fn = tempfile.mktemp(".ini")
@@ -541,6 +544,7 @@
     finally:
         logging._handlers.clear()
         logging._handlers.update(saved_handlers)
+        logging._handlerList = saved_handler_list
         loggerDict = logging.getLogger().manager.loggerDict
         loggerDict.clear()
         loggerDict.update(saved_loggers)