fix: apply the suggestion

Signed-off-by: yihong0618 <[email protected]>

Author: yihong0618

Lib/_pyrepl/unix_console.py

@@ -391,15 +391,14 @@ def restore(self):
             os.write(self.output_fd, b"\033[?7h")
 
         if hasattr(self, "old_sigwinch"):
-            if os.name != 'nt':
-                try:
-                    signal.signal(signal.SIGWINCH, self.old_sigwinch)
-                except ValueError as e:
-                    # We can silence the ValueError if signal.signal() raised it
-                    # from a non-main thread on a non-Windows platform. Otherwise,
-                    # we need to re-raise it as its cause could be different.
-                    if threading.current_thread() is threading.main_thread():
-                        raise e
+            try:
+                signal.signal(signal.SIGWINCH, self.old_sigwinch)
+            except ValueError as e:
+                # We can silence the ValueError if signal.signal() raised it
+                # from a non-main thread on a non-Windows platform. Otherwise,
+                # we need to re-raise it as its cause could be different.
+                if threading.current_thread() is threading.main_thread():
+                    raise e
             del self.old_sigwinch
 
     def push_char(self, char: int | bytes) -> None:

Lib/test/test_pyrepl/test_unix_console.py

@@ -4,10 +4,11 @@
 import signal
 import subprocess
 import sys
+import threading
 import unittest
 from functools import partial
 from test.support import os_helper, force_not_colorized_test_class
-from test.support import script_helper
+from test.support import script_helper, threading_helper
 
 from unittest import TestCase
 from unittest.mock import MagicMock, call, patch, ANY, Mock
@@ -317,23 +318,16 @@ def test_restore_with_invalid_environ_on_macos(self, _os_write):
             console.prepare()  # needed to call restore()
             console.restore()  # this should succeed
 
+    @threading_helper.reap_threads
+    @threading_helper.requires_working_threading()
     def test_restore_in_thread(self, _os_write):
-        # for gh-139391
-        import threading
+        # gh-139391: ensure that console.restore() silently suppresses
+        # exceptions when calling signal.signal() from a non-main thread.
         console = unix_console([])
         console.old_sigwinch = signal.SIG_DFL
-        exception_caught = []
-        def thread_target():
-            try:
-                console.restore()
-            except Exception as e:
-                exception_caught.append(e)
-        thread = threading.Thread(target=thread_target)
+        thread = threading.Thread(target=console.restore)
         thread.start()
-        thread.join()
-        # gh-139391: should not raise any exception when called from non-main thread
-        self.assertEqual(len(exception_caught), 0,
-                        "restore() should not raise any exception in non-main thread")
+        thread.join()  # this should not raise
 
 
 @unittest.skipIf(sys.platform == "win32", "No Unix console on Windows")