[Python-checkins] r87513 - python/branches/py3k/Lib/test/test_logging.py

Mon Dec 27 15:31:52 CET 2010

Author: vinay.sajip
Date: Mon Dec 27 15:31:52 2010
New Revision: 87513
Log:
Issue #10626: test_logging now preserves logger disabled states.
Modified:
 python/branches/py3k/Lib/test/test_logging.py
Modified: python/branches/py3k/Lib/test/test_logging.py
==============================================================================

--- python/branches/py3k/Lib/test/test_logging.py	(original)
+++ python/branches/py3k/Lib/test/test_logging.py	Mon Dec 27 15:31:52 2010
@@ -67,8 +67,12 @@
 try:
 self.saved_handlers = logging._handlers.copy()
 self.saved_handler_list = logging._handlerList[:]
- self.saved_loggers = logger_dict.copy()
+ self.saved_loggers = saved_loggers = logger_dict.copy()
 self.saved_level_names = logging._levelNames.copy()
+ self.logger_states = logger_states = {}
+ for name in saved_loggers:
+ logger_states[name] = getattr(saved_loggers[name],
+ 'disabled', None)
 finally:
 logging._releaseLock()
 
@@ -112,6 +116,10 @@
 loggerDict = logging.getLogger().manager.loggerDict
 loggerDict.clear()
 loggerDict.update(self.saved_loggers)
+ logger_states = self.logger_states
+ for name in self.logger_states:
+ if logger_states[name] is not None:
+ self.saved_loggers[name].disabled = logger_states[name]
 finally:
 logging._releaseLock()
 
