From: Benjamin Peterson Date: Wed, 30 Dec 2009 19:44:23 +0000 (+0000) Subject: Merged revisions 77158 via svnmerge from X-Git-Tag: v2.7a2~77 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df6f963f15824ad7553324648b5bcd221c221e15;p=python Merged revisions 77158 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r77158 | benjamin.peterson | 2009-12-30 13:41:03 -0600 (Wed, 30 Dec 2009) | 1 line clean up logging's global state after the test finishes ........ --- diff --git a/Lib/lib2to3/tests/test_main.py b/Lib/lib2to3/tests/test_main.py index 029193140d..586b8df045 100644 --- a/Lib/lib2to3/tests/test_main.py +++ b/Lib/lib2to3/tests/test_main.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import sys import codecs +import logging import StringIO import unittest @@ -9,6 +10,10 @@ from lib2to3 import main class TestMain(unittest.TestCase): + def tearDown(self): + # Clean up logging configuration down by main. + del logging.root.handlers[:] + def run_2to3_capture(self, args, in_capture, out_capture, err_capture): save_stdin = sys.stdin save_stdout = sys.stdout