summaryrefslogtreecommitdiffstats
path: root/Lib/lib2to3
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-12-30 19:54:39 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-12-30 19:54:39 (GMT)
commit9207804bdb8492d68455e7a950e70e87e6984232 (patch)
tree8bb3af44a8cb784d246a0b390bbefb1415c3c225 /Lib/lib2to3
parent533849a27a461a6aee9688bbd18f2205da70a8df (diff)
downloadcpython-9207804bdb8492d68455e7a950e70e87e6984232.zip
cpython-9207804bdb8492d68455e7a950e70e87e6984232.tar.gz
cpython-9207804bdb8492d68455e7a950e70e87e6984232.tar.bz2
Merged revisions 77163 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77163 | benjamin.peterson | 2009-12-30 13:52:54 -0600 (Wed, 30 Dec 2009) | 16 lines Merged revisions 77160 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r77160 | benjamin.peterson | 2009-12-30 13:44:23 -0600 (Wed, 30 Dec 2009) | 9 lines 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')
-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 2485f7a..754d5dd 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 io
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