From 9f459a15be567a9d17f7904bcb3d6a3e571db7a2 Mon Sep 17 00:00:00 2001
From: inventshah <39803835+inventshah@users.noreply.github.com>
Date: Sun, 13 Jul 2025 14:57:26 -0400
Subject: [PATCH] use support.captured_std* in test_pyrepl/test_interact.py

---
 Lib/test/test_pyrepl/test_interact.py | 37 +++++++++------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/Lib/test/test_pyrepl/test_interact.py b/Lib/test/test_pyrepl/test_interact.py
index 8c0eeab6dcae96..eeb4253e8d2be2 100644
--- a/Lib/test/test_pyrepl/test_interact.py
+++ b/Lib/test/test_pyrepl/test_interact.py
@@ -1,11 +1,9 @@
-import contextlib
-import io
 import unittest
 import warnings
 from unittest.mock import patch
 from textwrap import dedent
 
-from test.support import force_not_colorized
+from test.support import force_not_colorized, captured_stderr, captured_stdout
 
 from _pyrepl.console import InteractiveColoredConsole
 from _pyrepl.simple_interact import _more_lines
@@ -28,11 +26,10 @@ def bar(self):
         a
         """)
         console = InteractiveColoredConsole(namespace, filename="<stdin>")
-        f = io.StringIO()
         with (
             patch.object(InteractiveColoredConsole, "showsyntaxerror") as showsyntaxerror,
             patch.object(InteractiveColoredConsole, "runsource", wraps=console.runsource) as runsource,
-            contextlib.redirect_stdout(f),
+            captured_stdout(),
         ):
             more = console.push(code, filename="<stdin>", _symbol="single")  # type: ignore[call-arg]
         self.assertFalse(more)
@@ -48,8 +45,7 @@ def test_multiple_statements_output(self):
         a
         """)
         console = InteractiveColoredConsole(namespace, filename="<stdin>")
-        f = io.StringIO()
-        with contextlib.redirect_stdout(f):
+        with captured_stdout() as f:
             more = console.push(code, filename="<stdin>", _symbol="single")  # type: ignore[call-arg]
         self.assertFalse(more)
         self.assertEqual(f.getvalue(), "1\n")
@@ -61,8 +57,7 @@ def test_multiple_statements_fail_early(self):
         raise Exception('foobar')
         print('spam', 'eggs', sep='&')
         """)
-        f = io.StringIO()
-        with contextlib.redirect_stderr(f):
+        with captured_stderr() as f:
             console.runsource(code)
         self.assertIn('Exception: foobar', f.getvalue())
         self.assertNotIn('spam&eggs', f.getvalue())
@@ -71,8 +66,7 @@ def test_empty(self):
         namespace = {}
         code = ""
         console = InteractiveColoredConsole(namespace, filename="<stdin>")
-        f = io.StringIO()
-        with contextlib.redirect_stdout(f):
+        with captured_stdout() as f:
             more = console.push(code, filename="<stdin>", _symbol="single")  # type: ignore[call-arg]
         self.assertFalse(more)
         self.assertEqual(f.getvalue(), "")
@@ -87,8 +81,7 @@ def test_runsource_compiles_and_runs_code(self):
     def test_runsource_returns_false_for_successful_compilation(self):
         console = InteractiveColoredConsole()
         source = "print('Hello, world!')"
-        f = io.StringIO()
-        with contextlib.redirect_stdout(f):
+        with captured_stdout():
             result = console.runsource(source)
         self.assertFalse(result)
 
@@ -96,8 +89,7 @@ def test_runsource_returns_false_for_successful_compilation(self):
     def test_runsource_returns_false_for_failed_compilation(self):
         console = InteractiveColoredConsole()
         source = "print('Hello, world!'"
-        f = io.StringIO()
-        with contextlib.redirect_stderr(f):
+        with captured_stderr() as f:
             result = console.runsource(source)
         self.assertFalse(result)
         self.assertIn('SyntaxError', f.getvalue())
@@ -106,8 +98,7 @@ def test_runsource_returns_false_for_failed_compilation(self):
     def test_runsource_show_syntax_error_location(self):
         console = InteractiveColoredConsole()
         source = "def f(x, x): ..."
-        f = io.StringIO()
-        with contextlib.redirect_stderr(f):
+        with captured_stderr() as f:
             result = console.runsource(source)
         self.assertFalse(result)
         r = """
@@ -134,8 +125,7 @@ def test_runsource_shows_syntax_error_for_failed_compilation(self):
     def test_runsource_survives_null_bytes(self):
         console = InteractiveColoredConsole()
         source = "\x00\n"
-        f = io.StringIO()
-        with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f):
+        with captured_stdout(), captured_stderr() as f:
             result = console.runsource(source)
         self.assertFalse(result)
         self.assertIn("source code string cannot contain null bytes", f.getvalue())
@@ -146,8 +136,7 @@ def test_no_active_future(self):
         x: int = 1
         print(__annotate__(1))
         """)
-        f = io.StringIO()
-        with contextlib.redirect_stdout(f):
+        with captured_stdout() as f:
             result = console.runsource(source)
         self.assertFalse(result)
         self.assertEqual(f.getvalue(), "{'x': <class 'int'>}\n")
@@ -159,16 +148,14 @@ def test_future_annotations(self):
         def g(x: int): ...
         print(g.__annotations__)
         """)
-        f = io.StringIO()
-        with contextlib.redirect_stdout(f):
+        with captured_stdout() as f:
             result = console.runsource(source)
         self.assertFalse(result)
         self.assertEqual(f.getvalue(), "{'x': 'int'}\n")
 
     def test_future_barry_as_flufl(self):
         console = InteractiveColoredConsole()
-        f = io.StringIO()
-        with contextlib.redirect_stdout(f):
+        with captured_stdout() as f:
             result = console.runsource("from __future__ import barry_as_FLUFL\n")
             result = console.runsource("""print("black" <> 'blue')\n""")
         self.assertFalse(result)

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/python/cpython/pull/136633.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/python/cpython/pull/136633.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/python/cpython/pull/136633.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/python/cpython/pull/136633.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>