Revert changes

Author: donbarbos

Lib/test/test_argparse.py

@@ -56,7 +56,7 @@ class StdStreamTest(unittest.TestCase):
     def test_skip_invalid_stderr(self):
         parser = argparse.ArgumentParser()
         with (
-            captured_stderr(),
+            contextlib.redirect_stderr(None),
             mock.patch('argparse._sys.exit')
         ):
             parser.exit(status=0, message='foo')

Lib/test/test_compile.py

@@ -1,4 +1,6 @@
+import contextlib
 import dis
+import io
 import itertools
 import math
 import opcode
@@ -965,7 +967,8 @@ class C:
             for mode in ["exec", "single"]:
                 with self.subTest(opt=opt, mode=mode):
                     code = compile(src, "<test>", mode, optimize=opt)
-                    with support.captured_stdout() as output:
+                    output = io.StringIO()
+                    with contextlib.redirect_stdout(output):
                         dis.dis(code)
                     self.assertNotIn('NOP', output.getvalue())
 

Lib/test/test_compileall.py

@@ -2,6 +2,7 @@
 import contextlib
 import filecmp
 import importlib.util
+import io
 import os
 import py_compile
 import shutil
@@ -88,7 +89,7 @@ def test_year_2038_mtime_compilation(self):
             os.utime(self.source_path, (2**32 - 1, 2**32 - 1))
         except (OverflowError, OSError):
             self.skipTest("filesystem doesn't support timestamps near 2**32")
-        with support.captured_stdout():
+        with contextlib.redirect_stdout(io.StringIO()):
             self.assertTrue(compileall.compile_file(self.source_path))
 
     def test_larger_than_32_bit_times(self):
@@ -98,7 +99,7 @@ def test_larger_than_32_bit_times(self):
             os.utime(self.source_path, (2**35, 2**35))
         except (OverflowError, OSError):
             self.skipTest("filesystem doesn't support large timestamps")
-        with support.captured_stdout():
+        with contextlib.redirect_stdout(io.StringIO()):
             self.assertTrue(compileall.compile_file(self.source_path))
 
     def recreation_check(self, metadata):
@@ -205,7 +206,7 @@ def test_no_pycache_in_non_package(self):
     def test_compile_file_encoding_fallback(self):
         # Bug 44666 reported that compile_file failed when sys.stdout.encoding is None
         self.add_bad_source_file()
-        with support.captured_stdout():
+        with contextlib.redirect_stdout(io.StringIO()):
             self.assertFalse(compileall.compile_file(self.bad_source_path))
 
 
@@ -509,7 +510,8 @@ def tearDown(self):
         shutil.rmtree(self.directory)
 
     def test_error(self):
-        with support.captured_stdout() as buffer:
+        buffer = io.TextIOWrapper(io.BytesIO(), encoding='ascii')
+        with contextlib.redirect_stdout(buffer):
             compiled = compileall.compile_dir(self.directory)
         self.assertFalse(compiled)  # should not be successful
         buffer.seek(0)

Lib/test/test_concurrent_futures/test_interpreter_pool.py

@@ -1,6 +1,7 @@
 import _thread
 import asyncio
 import contextlib
+import io
 import os
 import subprocess
 import sys
@@ -198,14 +199,14 @@ def init2():
             nonlocal count
             count += 1
 
-        with support.captured_stderr() as stderr:
+        with contextlib.redirect_stderr(io.StringIO()) as stderr:
             with self.executor_type(initializer=init1) as executor:
                 fut = executor.submit(lambda: None)
         self.assertIn('NotShareableError', stderr.getvalue())
         with self.assertRaises(BrokenInterpreterPool):
             fut.result()
 
-        with support.captured_stderr() as stderr:
+        with contextlib.redirect_stderr(io.StringIO()) as stderr:
             with self.executor_type(initializer=init2) as executor:
                 fut = executor.submit(lambda: None)
         self.assertIn('NotShareableError', stderr.getvalue())
@@ -218,7 +219,7 @@ def initializer(self):
                 raise NotImplementedError
         spam = Spam()
 
-        with support.captured_stderr() as stderr:
+        with contextlib.redirect_stderr(io.StringIO()) as stderr:
             with self.executor_type(initializer=spam.initializer) as executor:
                 fut = executor.submit(lambda: None)
         self.assertIn('NotShareableError', stderr.getvalue())
@@ -229,7 +230,7 @@ def initializer(self):
     def test_init_exception_in_script(self):
         executor = self.executor_type(initializer='raise Exception("spam")')
         with executor:
-            with support.captured_stderr() as stderr:
+            with contextlib.redirect_stderr(io.StringIO()) as stderr:
                 fut = executor.submit('pass')
                 with self.assertRaises(BrokenInterpreterPool):
                     fut.result()
@@ -243,7 +244,7 @@ def test_init_exception_in_func(self):
         executor = self.executor_type(initializer=fail,
                                       initargs=(Exception, 'spam'))
         with executor:
-            with support.captured_stderr() as stderr:
+            with contextlib.redirect_stderr(io.StringIO()) as stderr:
                 fut = executor.submit(noop)
                 with self.assertRaises(BrokenInterpreterPool):
                     fut.result()

Lib/test/test_descr.py

@@ -1295,7 +1295,7 @@ def __init__(self):
             def __del__(self_):
                 self.assertEqual(self_.a, 1)
                 self.assertEqual(self_.b, 2)
-        with support.captured_stderr() as s:
+        with support.captured_output('stderr') as s:
             h = H()
             del h
         self.assertEqual(s.getvalue(), '')

Lib/test/test_dis.py

@@ -1,6 +1,7 @@
 # Minimal tests for dis module
 
 import ast
+import contextlib
 import dis
 import functools
 import io
@@ -12,9 +13,9 @@
 import textwrap
 import types
 import unittest
-from test.support import (captured_stderr, captured_stdout,
-                          requires_debug_ranges, requires_specialization,
-                          cpython_only, os_helper, import_helper, reset_code)
+from test.support import (captured_stdout, requires_debug_ranges,
+                          requires_specialization, cpython_only,
+                          os_helper, import_helper, reset_code)
 from test.support.bytecode_helper import BytecodeTestCase
 
 
@@ -970,7 +971,8 @@ class DisTests(DisTestBase):
 
     def get_disassembly(self, func, lasti=-1, wrapper=True, **kwargs):
         # We want to test the default printing behaviour, not the file arg
-        with captured_stdout() as output:
+        output = io.StringIO()
+        with contextlib.redirect_stdout(output):
             if wrapper:
                 dis.dis(func, **kwargs)
             else:
@@ -986,7 +988,8 @@ def do_disassembly_test(self, func, expected, **kwargs):
         self.do_disassembly_compare(got, expected)
         # Add checks for dis.disco
         if hasattr(func, '__code__'):
-            with captured_stdout() as got_disco:
+            got_disco = io.StringIO()
+            with contextlib.redirect_stdout(got_disco):
                 dis.disco(func.__code__, **kwargs)
             self.do_disassembly_compare(got_disco.getvalue(), expected)
 
@@ -1706,7 +1709,8 @@ def _stringify_instruction(instr):
     return base + "),"
 
 def _prepare_test_cases():
-    with captured_stdout():
+    ignore = io.StringIO()
+    with contextlib.redirect_stdout(ignore):
         f = outer()
         inner = f()
     _instructions_outer = dis.get_instructions(outer, first_line=expected_outer_line)
@@ -2424,7 +2428,8 @@ def setUp(self) -> None:
         return super().setUp()
 
     def get_disassembly(self, tb):
-        with captured_stdout() as output:
+        output = io.StringIO()
+        with contextlib.redirect_stdout(output):
             dis.distb(tb)
         return output.getvalue()
 
@@ -2450,7 +2455,8 @@ def test_distb_explicit_arg(self):
 class TestDisTracebackWithFile(TestDisTraceback):
     # Run the `distb` tests again, using the file arg instead of print
     def get_disassembly(self, tb):
-        with captured_stdout() as output:
+        output = io.StringIO()
+        with contextlib.redirect_stdout(output):
             dis.distb(tb, file=output)
         return output.getvalue()
 
@@ -2500,7 +2506,8 @@ def set_source(self, content):
             fp.write(self.text_normalize(content))
 
     def invoke_dis(self, *flags):
-        with captured_stdout() as output:
+        output = io.StringIO()
+        with contextlib.redirect_stdout(output):
             dis.main(args=[*flags, self.filename])
         return self.text_normalize(output.getvalue())
 
@@ -2534,7 +2541,7 @@ def f():
 
         with self.assertRaises(SystemExit):
             # suppress argparse error message
-            with captured_stderr():
+            with contextlib.redirect_stderr(io.StringIO()):
                 _ = self.invoke_dis('--unknown')
 
     def test_show_cache(self):

Lib/test/test_future_stmt/test_future_multiple_features.py

@@ -12,7 +12,7 @@ def test_unicode_literals(self):
         self.assertIsInstance("", str)
 
     def test_print_function(self):
-        with support.captured_stderr() as s:
+        with support.captured_output("stderr") as s:
             print("foo", file=sys.stderr)
         self.assertEqual(s.getvalue(), "foo\n")
 

Lib/test/test_itertools.py

@@ -879,7 +879,7 @@ def __next__(self):
         def run(r1, r2):
             result = []
             for i, j in zip_longest(r1, r2, fillvalue=0):
-                with support.captured_stdout():
+                with support.captured_output('stdout'):
                     print((i, j))
                 result.append((i, j))
             return result

Lib/test/test_pdb.py

@@ -17,7 +17,7 @@
 import zipfile
 
 from asyncio.events import _set_event_loop_policy
-from contextlib import ExitStack
+from contextlib import ExitStack, redirect_stdout
 from io import StringIO
 from test import support
 from test.support import has_socket_support, os_helper
@@ -4571,7 +4571,7 @@ def test_checkline_is_not_executable(self):
         with open(os_helper.TESTFN, "w") as f:
             f.write(s)
         num_lines = len(s.splitlines()) + 2  # Test for EOF
-        with support.captured_stdout():
+        with redirect_stdout(StringIO()):
             db = pdb.Pdb()
             for lineno in range(num_lines):
                 self.assertFalse(db.checkline(os_helper.TESTFN, lineno))

Lib/test/test_platform.py

@@ -1,4 +1,6 @@
+import contextlib
 import copy
+import io
 import itertools
 import os
 import pickle
@@ -755,15 +757,17 @@ def setUp(self):
         self.addCleanup(platform.invalidate_caches)
 
     def invoke_platform(self, *flags):
-        with support.captured_stdout() as output:
+        output = io.StringIO()
+        with contextlib.redirect_stdout(output):
             platform._main(args=flags)
         return output.getvalue()
 
     @support.force_not_colorized
     def test_unknown_flag(self):
+        output = io.StringIO()
         with self.assertRaises(SystemExit):
             # suppress argparse error message
-            with support.captured_stderr() as output:
+            with contextlib.redirect_stderr(output):
                 _ = self.invoke_platform('--unknown')
         self.assertStartsWith(output.getvalue(), "usage: ")
 
@@ -800,9 +804,12 @@ def test_arg_parsing(self):
 
     @support.force_not_colorized
     def test_help(self):
+        output = io.StringIO()
+
         with self.assertRaises(SystemExit):
-            with support.captured_stdout() as output:
+            with contextlib.redirect_stdout(output):
                 platform._main(args=["--help"])
+
         self.assertStartsWith(output.getvalue(), "usage:")