Update contrib/python/prompt-toolkit/py3 to 3.0.43

Author: robot-piglet

contrib/python/prompt-toolkit/py3/.dist-info/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompt-toolkit
-Version: 3.0.41
+Version: 3.0.43
 Summary: Library for building powerful interactive command lines in Python
 Home-page: https://github.com/prompt-toolkit/python-prompt-toolkit
 Author: Jonathan Slenders

contrib/python/prompt-toolkit/py3/prompt_toolkit/__init__.py

@@ -27,7 +27,7 @@
 from .shortcuts import PromptSession, print_formatted_text, prompt
 
 # Don't forget to update in `docs/conf.py`!
-__version__ = "3.0.41"
+__version__ = "3.0.43"
 
 assert pep440.match(__version__)
 

contrib/python/prompt-toolkit/py3/prompt_toolkit/application/application.py

@@ -807,16 +807,19 @@ def set_is_running() -> Iterator[None]:
         @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 @@ def run_in_thread() -> None:
         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 @@ def _ignore(event: E) -> 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)

contrib/python/prompt-toolkit/py3/prompt_toolkit/buffer.py

@@ -15,7 +15,7 @@
 from collections import deque
 from enum import Enum
 from functools import wraps
-from typing import Any, Awaitable, Callable, Coroutine, Iterable, TypeVar, cast
+from typing import Any, Callable, Coroutine, Iterable, TypeVar, cast
 
 from .application.current import get_app
 from .application.run_in_terminal import run_in_terminal
@@ -1891,7 +1891,7 @@ def validate_and_handle(self) -> None:
                 self.reset()
 
 
-_T = TypeVar("_T", bound=Callable[..., Awaitable[None]])
+_T = TypeVar("_T", bound=Callable[..., Coroutine[Any, Any, None]])
 
 
 def _only_one_at_a_time(coroutine: _T) -> _T:

contrib/python/prompt-toolkit/py3/prompt_toolkit/contrib/regular_languages/__init__.py

@@ -30,7 +30,7 @@
 ---------------------------------
 
 - Syntax highlighting: We could use this for instance to give file names
-                       different colour.
+                       different color.
 - Parse the result: .. We can extract the file names and commands by using a
                        regular expression with named groups.
 - Input validation: .. Don't accept anything that does not match this grammar.

contrib/python/prompt-toolkit/py3/prompt_toolkit/contrib/ssh/server.py

@@ -6,7 +6,7 @@
 import asyncio
 import traceback
 from asyncio import get_running_loop
-from typing import Any, Awaitable, Callable, TextIO, cast
+from typing import Any, Callable, Coroutine, TextIO, cast
 
 import asyncssh
 
@@ -21,7 +21,7 @@
 class PromptToolkitSSHSession(asyncssh.SSHServerSession):  # type: ignore
     def __init__(
         self,
-        interact: Callable[[PromptToolkitSSHSession], Awaitable[None]],
+        interact: Callable[[PromptToolkitSSHSession], Coroutine[Any, Any, None]],
         *,
         enable_cpr: bool,
     ) -> None:
@@ -162,7 +162,7 @@ async def interact(ssh_session: PromptToolkitSSHSession) -> None:
 
     def __init__(
         self,
-        interact: Callable[[PromptToolkitSSHSession], Awaitable[None]],
+        interact: Callable[[PromptToolkitSSHSession], Coroutine[Any, Any, None]],
         *,
         enable_cpr: bool = True,
     ) -> None:

contrib/python/prompt-toolkit/py3/prompt_toolkit/contrib/telnet/server.py

@@ -7,7 +7,7 @@
 import contextvars
 import socket
 from asyncio import get_running_loop
-from typing import Awaitable, Callable, TextIO, cast
+from typing import Any, Callable, Coroutine, TextIO, cast
 
 from prompt_toolkit.application.current import create_app_session, get_app
 from prompt_toolkit.application.run_in_terminal import run_in_terminal
@@ -124,7 +124,7 @@ def __init__(
         self,
         conn: socket.socket,
         addr: tuple[str, int],
-        interact: Callable[[TelnetConnection], Awaitable[None]],
+        interact: Callable[[TelnetConnection], Coroutine[Any, Any, None]],
         server: TelnetServer,
         encoding: str,
         style: BaseStyle | None,
@@ -283,7 +283,9 @@ def __init__(
         self,
         host: str = "127.0.0.1",
         port: int = 23,
-        interact: Callable[[TelnetConnection], Awaitable[None]] = _dummy_interact,
+        interact: Callable[
+            [TelnetConnection], Coroutine[Any, Any, None]
+        ] = _dummy_interact,
         encoding: str = "utf-8",
         style: BaseStyle | None = None,
         enable_cpr: bool = True,

contrib/python/prompt-toolkit/py3/prompt_toolkit/eventloop/inputhook.py

@@ -66,7 +66,7 @@ def fileno(self) -> int:
 
 
 def new_eventloop_with_inputhook(
-    inputhook: Callable[[InputHookContext], None]
+    inputhook: Callable[[InputHookContext], None],
 ) -> AbstractEventLoop:
     """
     Create a new event loop with the given inputhook.
@@ -77,7 +77,7 @@ def new_eventloop_with_inputhook(
 
 
 def set_eventloop_with_inputhook(
-    inputhook: Callable[[InputHookContext], None]
+    inputhook: Callable[[InputHookContext], None],
 ) -> AbstractEventLoop:
     """
     Create a new event loop with the given inputhook, and activate it.

contrib/python/prompt-toolkit/py3/prompt_toolkit/filters/app.py

@@ -50,7 +50,7 @@
 
 
 # NOTE: `has_focus` below should *not* be `memoized`. It can reference any user
-#       control. For instance, if we would contiously create new
+#       control. For instance, if we would continuously create new
 #       `PromptSession` instances, then previous instances won't be released,
 #       because this memoize (which caches results in the global scope) will
 #       still refer to each instance.

contrib/python/prompt-toolkit/py3/prompt_toolkit/formatted_text/__init__.py

@@ -16,6 +16,7 @@
 from .base import (
     AnyFormattedText,
     FormattedText,
+    OneStyleAndTextTuple,
     StyleAndTextTuples,
     Template,
     is_formatted_text,
@@ -35,6 +36,7 @@
 __all__ = [
     # Base.
     "AnyFormattedText",
+    "OneStyleAndTextTuple",
     "to_formatted_text",
     "is_formatted_text",
     "Template",