Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Vinay Sajip 2006-02-07 13:44:48 +00:00
parent 05110aaef5
commit f0a95eca45
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_logging.py
View File

@ -467,6 +467,7 @@ def test4():
sys.stdout.write('config%d: ' % i) sys.stdout.write('config%d: ' % i)
loggerDict = logging.getLogger().manager.loggerDict loggerDict = logging.getLogger().manager.loggerDict
saved_handlers = logging._handlers.copy() saved_handlers = logging._handlers.copy()
saved_handler_list = logging._handlerList[:]
saved_loggers = loggerDict.copy() saved_loggers = loggerDict.copy()
try: try:
fn = tempfile.mktemp(".ini") fn = tempfile.mktemp(".ini")
@ -484,6 +485,7 @@ def test4():
finally: finally:
logging._handlers.clear() logging._handlers.clear()
logging._handlers.update(saved_handlers) logging._handlers.update(saved_handlers)
logging._handlerList = saved_handler_list
loggerDict = logging.getLogger().manager.loggerDict loggerDict = logging.getLogger().manager.loggerDict
loggerDict.clear() loggerDict.clear()
loggerDict.update(saved_loggers) loggerDict.update(saved_loggers)
@ -526,6 +528,7 @@ class FriendlyFormatter (logging.Formatter):
def test5(): def test5():
loggerDict = logging.getLogger().manager.loggerDict loggerDict = logging.getLogger().manager.loggerDict
saved_handlers = logging._handlers.copy() saved_handlers = logging._handlers.copy()
saved_handler_list = logging._handlerList[:]
saved_loggers = loggerDict.copy() saved_loggers = loggerDict.copy()
try: try:
fn = tempfile.mktemp(".ini") fn = tempfile.mktemp(".ini")
@ -541,6 +544,7 @@ def test5():
finally: finally:
logging._handlers.clear() logging._handlers.clear()
logging._handlers.update(saved_handlers) logging._handlers.update(saved_handlers)
logging._handlerList = saved_handler_list
loggerDict = logging.getLogger().manager.loggerDict loggerDict = logging.getLogger().manager.loggerDict
loggerDict.clear() loggerDict.clear()
loggerDict.update(saved_loggers) loggerDict.update(saved_loggers)