fix: address comments better way fix

Signed-off-by: yihong0618 <[email protected]>
Co-authored-by: Bénédikt Tran <[email protected]>

Author: yihong0618

Lib/_pyrepl/unix_console.py

@@ -28,6 +28,7 @@
 import signal
 import struct
 import termios
+import threading
 import time
 import types
 import platform
@@ -390,15 +391,15 @@ def restore(self):
             os.write(self.output_fd, b"\033[?7h")
 
         if hasattr(self, "old_sigwinch"):
-            # Only restore signal handler if we're in the main thread
-            # signal.signal() only works in the main thread of the main interpreter
-            try:
-                signal.signal(signal.SIGWINCH, self.old_sigwinch)
-            except ValueError:
-                # This can happen when called from a non-main thread
-                # (e.g., asyncio REPL). In this case, we skip signal restoration
-                # to avoid the "signal only works in main thread" error.
-                pass
+            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
             del self.old_sigwinch
 
     def push_char(self, char: int | bytes) -> None:

Lib/test/test_pyrepl/test_unix_console.py

@@ -326,14 +326,14 @@ def test_restore_in_thread(self, _os_write):
         def thread_target():
             try:
                 console.restore()
-            except ValueError as e:
-                if "signal only works in main thread" in str(e):
-                    exception_caught.append(e)
+            except Exception as e:
+                exception_caught.append(e)
         thread = threading.Thread(target=thread_target)
         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 ValueError in non-main thread")
+                        "restore() should not raise any exception in non-main thread")
 
 
 @unittest.skipIf(sys.platform == "win32", "No Unix console on Windows")