[Python-checkins] cpython: Issue #12167: packaging.tests.support, LoggingCatcher restores correctly the

[victor.stinner]

http://hg.python.org/cpython/rev/70675864717b
changeset:   70329:70675864717b
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Tue May 24 13:59:21 2011 +0200
summary:
  Issue #12167: packaging.tests.support, LoggingCatcher restores correctly the
log level. Avoid also calls to .addCleanup() in setUp().

files:
  Lib/packaging/tests/support.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/packaging/tests/support.py b/Lib/packaging/tests/support.py
--- a/Lib/packaging/tests/support.py
+++ b/Lib/packaging/tests/support.py
@@ -71,8 +71,8 @@
     def setUp(self):
         super(LoggingCatcher, self).setUp()
         self.loghandler = handler = _TestHandler()
+        self.old_level = logger.level
         logger.addHandler(handler)
-        self.addCleanup(logger.setLevel, logger.level)
         logger.setLevel(logging.DEBUG)  # we want all messages
 
     def tearDown(self):
@@ -84,6 +84,7 @@
         for ref in weakref.getweakrefs(handler):
             logging._removeHandlerRef(ref)
         del self.loghandler
+        logger.setLevel(self.old_level)
         super(LoggingCatcher, self).tearDown()
 
     def get_logs(self, *levels):

-- 
Repository URL: http://hg.python.org/cpython