A few bug fixes for patch_stdout.

Author: jonathanslenders

examples/prompts/asyncio-prompt.py

@@ -43,7 +43,7 @@ async def interactive_shell():
     # Run echo loop. Read text from stdin, and reply it back.
     while True:
         try:
-            result = await session.prompt(async_=True)
+            result = await session.prompt_async()
             print('You said: "{0}"'.format(result))
         except (EOFError, KeyboardInterrupt):
             return

prompt_toolkit/output/defaults.py

@@ -1,6 +1,7 @@
 import sys
 from typing import Optional, TextIO, cast
 
+from prompt_toolkit.patch_stdout import StdoutProxy
 from prompt_toolkit.utils import (
     get_term_environment_variable,
     is_conemu_ansi,
@@ -31,6 +32,12 @@ def create_output(stdout: Optional[TextIO] = None) -> Output:
         else:
             stdout = sys.stderr
 
+    # If the patch_stdout context manager has been used, then sys.stdout is
+    # replaced by this proxy. For prompt_toolkit applications, we want to use
+    # the real stdout.
+    while isinstance(stdout, StdoutProxy):
+        stdout = stdout.original_stdout
+
     if is_windows():
         from .conemu import ConEmuOutput
         from .win32 import Win32Output

prompt_toolkit/patch_stdout.py

@@ -102,7 +102,7 @@ def write_and_flush() -> None:
         def write_and_flush_in_loop() -> None:
             # If an application is running, use `run_in_terminal`, otherwise
             # call it directly.
-            run_in_terminal(write_and_flush, in_executor=False)
+            run_in_terminal.run_in_terminal(write_and_flush, in_executor=False)
 
         # Make sure `write_and_flush` is executed *in* the event loop, not in
         # another thread.
@@ -155,3 +155,6 @@ def fileno(self) -> int:
         """
         # This is important for code that expects sys.stdout.fileno() to work.
         return self.original_stdout.fileno()
+
+    def isatty(self) -> bool:
+        return self.original_stdout.isatty()