mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Repair logging test spew caused by rev. 51206.

Browse source
This commit is contained in:
Georg Brandl 2006-08-12 08:32:02 +00:00
parent 953c1897d2
commit f3e304297e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/logging/config.py
View file

@ -79,7 +79,7 @@ def fileConfig(fname, defaults=None):
logging._acquireLock() logging._acquireLock()
try: try:
logging._handlers.clear() logging._handlers.clear()
logging._handlerList = [] del logging._handlerList[:]
# Handlers add themselves to logging._handlers # Handlers add themselves to logging._handlers
handlers = _install_handlers(cp, formatters) handlers = _install_handlers(cp, formatters)
_install_loggers(cp, handlers) _install_loggers(cp, handlers)

4
Lib/test/test_logging.py
View file

@ -493,7 +493,7 @@ def test4():
try: try:
logging._handlers.clear() logging._handlers.clear()
logging._handlers.update(saved_handlers) logging._handlers.update(saved_handlers)
logging._handlerList = saved_handler_list 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)
@ -560,7 +560,7 @@ def test5():
try: try:
logging._handlers.clear() logging._handlers.clear()
logging._handlers.update(saved_handlers) logging._handlers.update(saved_handlers)
logging._handlerList = saved_handler_list 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)