Import libs 4 (#758)

1 files changed, 49 insertions, 12 deletions

diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/application/application.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/application/application.py
index 726fc0a067..d4637811ba 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/application/application.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/application/application.py
@@ -807,16 +807,19 @@ class Application(Generic[_AppResult]):
         @contextmanager
         def set_handle_sigint(loop: AbstractEventLoop) -> Iterator[None]:
             if handle_sigint:
-                loop.add_signal_handler(
-                    signal.SIGINT,
-                    lambda *_: loop.call_soon_threadsafe(
-                        self.key_processor.send_sigint
-                    ),
-                )
-                try:
-                    yield
-                finally:
-                    loop.remove_signal_handler(signal.SIGINT)
+                with _restore_sigint_from_ctypes():
+                    # save sigint handlers (python and os level)
+                    # See: https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1576
+                    loop.add_signal_handler(
+                        signal.SIGINT,
+                        lambda *_: loop.call_soon_threadsafe(
+                            self.key_processor.send_sigint
+                        ),
+                    )
+                    try:
+                        yield
+                    finally:
+                        loop.remove_signal_handler(signal.SIGINT)
             else:
                 yield
 
@@ -960,7 +963,8 @@ class Application(Generic[_AppResult]):
         def _called_from_ipython() -> bool:
             try:
                 return (
-                    "IPython/terminal/interactiveshell.py"
+                    sys.modules["IPython"].version_info < (8, 18, 0, "")
+                    and "IPython/terminal/interactiveshell.py"
                     in sys._getframe(3).f_code.co_filename
                 )
             except BaseException:
@@ -1545,7 +1549,7 @@ async def _do_wait_for_enter(wait_text: AnyFormattedText) -> None:
 
 @contextmanager
 def attach_winch_signal_handler(
-    handler: Callable[[], None]
+    handler: Callable[[], None],
 ) -> Generator[None, None, None]:
     """
     Attach the given callback as a WINCH signal handler within the context
@@ -1586,3 +1590,36 @@ def attach_winch_signal_handler(
                 previous_winch_handler._callback,
                 *previous_winch_handler._args,
             )
+
+
+@contextmanager
+def _restore_sigint_from_ctypes() -> Generator[None, None, None]:
+    # The following functions are part of the stable ABI since python 3.2
+    # See: https://docs.python.org/3/c-api/sys.html#c.PyOS_getsig
+    # Inline import: these are not available on Pypy.
+    try:
+        from ctypes import c_int, c_void_p, pythonapi
+    except ImportError:
+        # Any of the above imports don't exist? Don't do anything here.
+        yield
+        return
+
+    # PyOS_sighandler_t PyOS_getsig(int i)
+    pythonapi.PyOS_getsig.restype = c_void_p
+    pythonapi.PyOS_getsig.argtypes = (c_int,)
+
+    # PyOS_sighandler_t PyOS_setsig(int i, PyOS_sighandler_t h)
+    pythonapi.PyOS_setsig.restype = c_void_p
+    pythonapi.PyOS_setsig.argtypes = (
+        c_int,
+        c_void_p,
+    )
+
+    sigint = signal.getsignal(signal.SIGINT)
+    sigint_os = pythonapi.PyOS_getsig(signal.SIGINT)
+
+    try:
+        yield
+    finally:
+        signal.signal(signal.SIGINT, sigint)
+        pythonapi.PyOS_setsig(signal.SIGINT, sigint_os)