From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 7 Feb 2006 13:44:48 +0000 (+0000)
Subject: Saved and restored logging._handlerList at the same time as saving/restoring logging... 
X-Git-Tag: v2.5a0~709
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0a95eca45b6a56c0eac0ed0fee643c0a8ce9f24;p=thirdparty%2FPython%2Fcpython.git

Saved and restored logging._handlerList at the same time as saving/restoring logging._handlers.
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index bcebc8332918..f3987205847b 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -467,6 +467,7 @@ def test4():
         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 @@ def test4():
         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 @@ class FriendlyFormatter (logging.Formatter):
 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 @@ def test5():
     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)