From 7bd5dbe9a03755b3221a29523a62b50c02c167b2 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Sun, 5 Dec 2010 07:17:25 +0000 Subject: [PATCH] More fine-grained monitoring of alterations to logging state --- Lib/test/regrtest.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index e16594f35a8..4aa12b6d72f 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -815,7 +815,8 @@ class saved_test_environment: resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr', 'os.environ', 'sys.path', 'sys.path_hooks', '__import__', - 'warnings.filters', 'asyncore.socket_map', 'logging._handlers') + 'warnings.filters', 'asyncore.socket_map', + 'logging._handlers', 'logging._handlerList') def get_sys_argv(self): return id(sys.argv), sys.argv, sys.argv[:] @@ -885,13 +886,18 @@ class saved_test_environment: def get_logging__handlers(self): # _handlers is a WeakValueDictionary - # _handlerList is a list of weakrefs to handlers - return (id(logging._handlers), logging._handlers, logging._handlers.copy(), - id(logging._handlerList), logging._handlerList, logging._handlerList[:]) + return id(logging._handlers), logging._handlers, logging._handlers.copy() def restore_logging__handlers(self, saved_handlers): # Can't easily revert the logging state pass + def get_logging__handlerList(self): + # _handlerList is a list of weakrefs to handlers + return id(logging._handlerList), logging._handlerList, logging._handlerList[:] + def restore_logging__handlerList(self, saved_handlerList): + # Can't easily revert the logging state + pass + def resource_info(self): for name in self.resources: method_suffix = name.replace('.', '_')