gh-119205: Improve suppression warning

python · ambv · May 21, 2024 · May 20, 2024 · May 20, 2024 · May 20, 2024
commit 6509c29e76d181d8d24a6784a4104a9a1d518cd4
@@ -28,6 +28,7 @@
 
 from __future__ import annotations
 
+import warnings
 from dataclasses import dataclass, field
 
 import os
@@ -297,15 +298,13 @@ def multiline_input(self, more_lines: MoreLinesCallable, ps1: str, ps2: str) ->
         """
         reader = self.get_reader()
         saved = reader.more_lines
-        original_stderr = sys.stderr
-        sys.stderr = None
         try:
             reader.more_lines = more_lines
             reader.ps1 = reader.ps2 = ps1
             reader.ps3 = reader.ps4 = ps2
-            return reader.readline(), reader.was_paste_mode_activated
+            with warnings.catch_warnings(action="ignore"):
+                return reader.readline(), reader.was_paste_mode_activated
         finally:
-            sys.stderr = original_stderr
             reader.more_lines = saved
             reader.paste_mode = False
             reader.was_paste_mode_activated = False

diff --git a/Lib/test/test_pyrepl.py b/Lib/test/test_pyrepl.py
@@ -638,8 +638,8 @@ def test_completion_with_warnings(self, mock_stderr, mock_get_reader):
         class Dummy:
             @property
             def test_func(self):
-                import sys
-                sys.stderr.write("warnings\n")
+                import warnings
+                warnings.warn("warnings\n")
                 return None
 
         dummy = Dummy()
@@ -648,7 +648,7 @@ def test_func(self):
         reader = self.prepare_reader(events, namespace)
         mock_get_reader.return_value = reader
         output = readline_multiline_input(more_lines, ">>>", "...")
-        self.assertEqual(output[0], "dummy.test_func.")
+        self.assertEqual(output[0], "dummy.test_func.__")
         self.assertEqual(mock_stderr.getvalue(), "")