Commit eb392941 authored by Éric Araujo's avatar Éric Araujo

Silence 2to3 warnings in packaging tests

parent dccf9855
...@@ -28,13 +28,11 @@ Each class or function has a docstring to explain its purpose and usage. ...@@ -28,13 +28,11 @@ Each class or function has a docstring to explain its purpose and usage.
""" """
import os import os
import errno
import shutil import shutil
import logging import logging
import weakref import weakref
import tempfile import tempfile
from packaging import logger
from packaging.dist import Distribution from packaging.dist import Distribution
from packaging.tests import unittest from packaging.tests import unittest
from test.support import requires_zlib, unlink from test.support import requires_zlib, unlink
...@@ -44,6 +42,10 @@ __all__ = ['LoggingCatcher', 'TempdirManager', 'EnvironRestorer', ...@@ -44,6 +42,10 @@ __all__ = ['LoggingCatcher', 'TempdirManager', 'EnvironRestorer',
'skip_unless_symlink', 'requires_zlib'] 'skip_unless_symlink', 'requires_zlib']
logger = logging.getLogger('packaging')
logger2to3 = logging.getLogger('RefactoringTool')
class _TestHandler(logging.handlers.BufferingHandler): class _TestHandler(logging.handlers.BufferingHandler):
# stolen and adapted from test.support # stolen and adapted from test.support
...@@ -74,9 +76,10 @@ class LoggingCatcher: ...@@ -74,9 +76,10 @@ class LoggingCatcher:
def setUp(self): def setUp(self):
super(LoggingCatcher, self).setUp() super(LoggingCatcher, self).setUp()
self.loghandler = handler = _TestHandler() self.loghandler = handler = _TestHandler()
self.old_level = logger.level self._old_levels = logger.level, logger2to3.level
logger.addHandler(handler) logger.addHandler(handler)
logger.setLevel(logging.DEBUG) # we want all messages logger.setLevel(logging.DEBUG) # we want all messages
logger2to3.setLevel(logging.CRITICAL) # we don't want 2to3 messages
def tearDown(self): def tearDown(self):
handler = self.loghandler handler = self.loghandler
...@@ -87,7 +90,8 @@ class LoggingCatcher: ...@@ -87,7 +90,8 @@ class LoggingCatcher:
for ref in weakref.getweakrefs(handler): for ref in weakref.getweakrefs(handler):
logging._removeHandlerRef(ref) logging._removeHandlerRef(ref)
del self.loghandler del self.loghandler
logger.setLevel(self.old_level) logger.setLevel(self._old_levels[0])
logger2to3.setLevel(self._old_levels[1])
super(LoggingCatcher, self).tearDown() super(LoggingCatcher, self).tearDown()
def get_logs(self, *levels): def get_logs(self, *levels):
......
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