intermediate changes

ref:b4f892f3c2b06a356c155f73c27efc5661a7fb89

1 files changed, 59 insertions, 15 deletions

diff --git a/contrib/python/prompt-toolkit/py3/prompt_toolkit/input/posix_pipe.py b/contrib/python/prompt-toolkit/py3/prompt_toolkit/input/posix_pipe.py
index 22dd7be6b5..1e7dec77fd 100644
--- a/contrib/python/prompt-toolkit/py3/prompt_toolkit/input/posix_pipe.py
+++ b/contrib/python/prompt-toolkit/py3/prompt_toolkit/input/posix_pipe.py
@@ -1,5 +1,10 @@
+import sys
+
+assert sys.platform != "win32"
+
 import os
-from typing import ContextManager, TextIO, cast
+from contextlib import contextmanager
+from typing import ContextManager, Iterator, TextIO, cast
 
 from ..utils import DummyContext
 from .base import PipeInput
@@ -10,6 +15,36 @@ __all__ = [
 ]
 
 
+class _Pipe:
+    "Wrapper around os.pipe, that ensures we don't double close any end."
+
+    def __init__(self) -> None:
+        self.read_fd, self.write_fd = os.pipe()
+        self._read_closed = False
+        self._write_closed = False
+
+    def close_read(self) -> None:
+        "Close read-end if not yet closed."
+        if self._read_closed:
+            return
+
+        os.close(self.read_fd)
+        self._read_closed = True
+
+    def close_write(self) -> None:
+        "Close write-end if not yet closed."
+        if self._write_closed:
+            return
+
+        os.close(self.write_fd)
+        self._write_closed = True
+
+    def close(self) -> None:
+        "Close both read and write ends."
+        self.close_read()
+        self.close_write()
+
+
 class PosixPipeInput(Vt100Input, PipeInput):
     """
     Input that is send through a pipe.
@@ -18,14 +53,15 @@ class PosixPipeInput(Vt100Input, PipeInput):
 
     Usage::
 
-        input = PosixPipeInput()
-        input.send_text('inputdata')
+        with PosixPipeInput.create() as input:
+            input.send_text('inputdata')
     """
 
     _id = 0
 
-    def __init__(self, text: str = "") -> None:
-        self._r, self._w = os.pipe()
+    def __init__(self, _pipe: _Pipe, _text: str = "") -> None:
+        # Private constructor. Users should use the public `.create()` method.
+        self.pipe = _pipe
 
         class Stdin:
             encoding = "utf-8"
@@ -34,21 +70,30 @@ class PosixPipeInput(Vt100Input, PipeInput):
                 return True
 
             def fileno(stdin) -> int:
-                return self._r
+                return self.pipe.read_fd
 
         super().__init__(cast(TextIO, Stdin()))
-        self.send_text(text)
+        self.send_text(_text)
 
         # Identifier for every PipeInput for the hash.
         self.__class__._id += 1
         self._id = self.__class__._id
 
+    @classmethod
+    @contextmanager
+    def create(cls, text: str = "") -> Iterator["PosixPipeInput"]:
+        pipe = _Pipe()
+        try:
+            yield PosixPipeInput(_pipe=pipe, _text=text)
+        finally:
+            pipe.close()
+
     def send_bytes(self, data: bytes) -> None:
-        os.write(self._w, data)
+        os.write(self.pipe.write_fd, data)
 
     def send_text(self, data: str) -> None:
         "Send text to the input."
-        os.write(self._w, data.encode("utf-8"))
+        os.write(self.pipe.write_fd, data.encode("utf-8"))
 
     def raw_mode(self) -> ContextManager[None]:
         return DummyContext()
@@ -58,12 +103,11 @@ class PosixPipeInput(Vt100Input, PipeInput):
 
     def close(self) -> None:
         "Close pipe fds."
-        os.close(self._r)
-        os.close(self._w)
-
-        # We should assign `None` to 'self._r` and 'self._w',
-        # The event loop still needs to know the the fileno for this input in order
-        # to properly remove it from the selectors.
+        # Only close the write-end of the pipe. This will unblock the reader
+        # callback (in vt100.py > _attached_input), which eventually will raise
+        # `EOFError`. If we'd also close the read-end, then the event loop
+        # won't wake up the corresponding callback because of this.
+        self.pipe.close_write()
 
     def typeahead_hash(self) -> str:
         """