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
    ........
  ................
................

diff --git a/Lib/lib2to3/tests/test_main.py b/Lib/lib2to3/tests/test_main.py
index 2485f7a434b4aafc92eaff2def079834bc3a783d..754d5ddf6e2684238ed2fa161e38568186e13f81 100644 (file)
--- 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