summaryrefslogtreecommitdiffstats
path: root/Lib/lib2to3/tests
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-12-30 19:44:23 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-12-30 19:44:23 (GMT)
commitdf6f963f15824ad7553324648b5bcd221c221e15 (patch)
treeed2691f1d24f566fbae4023765c548d590a1d11b /Lib/lib2to3/tests
parent0f02d3933bff50042dd914d5d17831af7093cf55 (diff)
downloadcpython-df6f963f15824ad7553324648b5bcd221c221e15.zip
cpython-df6f963f15824ad7553324648b5bcd221c221e15.tar.gz
cpython-df6f963f15824ad7553324648b5bcd221c221e15.tar.bz2
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 ........
Diffstat (limited to 'Lib/lib2to3/tests')
-rw-r--r--Lib/lib2to3/tests/test_main.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/lib2to3/tests/test_main.py b/Lib/lib2to3/tests/test_main.py
index 0291931..586b8df 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