Commit 103ef578 authored by Georg Brandl's avatar Georg Brandl

Repair logging test spew caused by rev. 51206.

parent 108b2baf
...@@ -79,7 +79,7 @@ def fileConfig(fname, defaults=None): ...@@ -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)
......
...@@ -493,7 +493,7 @@ def test4(): ...@@ -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(): ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment