From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 24 May 2011 11:59:21 +0000 (+0200)
Subject: Issue #12167: packaging.tests.support, LoggingCatcher restores correctly the
X-Git-Tag: v3.3.0a1~2183^2~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79d1b1ce3fdfd6f62d77f6096e1bc61ee2170cdf;p=python

Issue #12167: packaging.tests.support, LoggingCatcher restores correctly the
log level. Avoid also calls to .addCleanup() in setUp().
---

diff --git a/Lib/packaging/tests/support.py b/Lib/packaging/tests/support.py
index 0c85b5d697..6d60b9e9a7 100644
--- a/Lib/packaging/tests/support.py
+++ b/Lib/packaging/tests/support.py
@@ -71,8 +71,8 @@ class LoggingCatcher:
     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 @@ class LoggingCatcher:
         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):