Merge branch 'master' into th-threadsafe-load-2

Author: Bob Hyman

.travis.yml

@@ -1,17 +1,16 @@
-sudo: false
+os: linux
+dist: focal
 cache: pip
 language: python
 
-matrix:
+jobs:
  include:
+ - python: 3.8
  - python: 3.7
- dist: xenial
- sudo: required
  - python: 3.6
 
 install:
- - pip install . pytest coverage codecov flake8 mypy
- - pip install isort black
+ - pip install . black coverage codecov flake8 isort mypy pytest
  - pip list
 
 script:
@@ -24,7 +23,7 @@ script:
 
  # Check wheather the imports were sorted correctly.
  # When this fails, please run ./tools/sort-imports.sh
- - isort -c -rc prompt_toolkit examples tests setup.py
+ - isort -c -rc --profile black prompt_toolkit examples tests setup.py
 
  - black --check prompt_toolkit examples tests setup.py
 

docs/pages/asking_for_input.rst

@@ -960,3 +960,40 @@ returns a coroutines and is awaitable.
 The :func:`~prompt_toolkit.patch_stdout.patch_stdout` context manager is
 optional, but it's recommended, because other coroutines could print to stdout.
 This ensures that other output won't destroy the prompt.
+
+
+Reading keys from stdin, one key at a time, but without a prompt
+----------------------------------------------------------------
+
+Suppose that you want to use prompt_toolkit to read the keys from stdin, one
+key at a time, but not render a prompt to the output, that is also possible:
+
+.. code:: python
+
+ import asyncio
+
+ from prompt_toolkit.input import create_input
+ from prompt_toolkit.keys import Keys
+
+
+ async def main() -> None:
+ done = asyncio.Event()
+ input = create_input()
+
+ def keys_ready():
+ for key_press in input.read_keys():
+ print(key_press)
+
+ if key_press.key == Keys.ControlC:
+ done.set()
+
+ with input.raw_mode():
+ with input.attach(keys_ready):
+ await done.wait()
+
+
+ if __name__ == "__main__":
+ asyncio.run(main())
+
+The above snippet will print the `KeyPress` object whenever a key is pressed.
+This is also cross platform, and should work on Windows.

examples/full-screen/full-screen-demo.py

@@ -202,8 +202,6 @@ def do_exit():
  "window.border shadow": "#444444",
  "focused button": "bg:#880000 #ffffff noinherit",
  # Styling for Dialog widgets.
- "radiolist focused": "noreverse",
- "radiolist focused radio.selected": "reverse",
  "button-bar": "bg:#aaaaff",
  }
 )

prompt_toolkit/document.py

@@ -456,7 +456,7 @@ def _is_word_before_cursor_complete(
  self, WORD: bool = False, pattern: Optional[Pattern[str]] = None
  ) -> bool:
  if pattern:
- return self.find_start_of_previous_word(pattern=pattern) is None
+ return self.find_start_of_previous_word(WORD=WORD, pattern=pattern) is None
  else:
  return (
  self.text_before_cursor == "" or self.text_before_cursor[-1:].isspace()

prompt_toolkit/output/vt100.py

@@ -8,6 +8,7 @@
 """
 import array
 import errno
+import io
 import os
 import sys
 from typing import (
@@ -452,16 +453,21 @@ def from_pty(
  (This will take the dimensions by reading the pseudo
  terminal attributes.)
  """
+ fd: Optional[int]
  # Normally, this requires a real TTY device, but people instantiate
  # this class often during unit tests as well. For convenience, we print
  # an error message, use standard dimensions, and go on.
- fd = stdout.fileno()
+ try:
+ fd = stdout.fileno()
+ except io.UnsupportedOperation:
+ fd = None
 
- if not stdout.isatty() and fd not in cls._fds_not_a_terminal:
+ if not stdout.isatty() and (fd is None or fd not in cls._fds_not_a_terminal):
  msg = "Warning: Output is not a terminal (fd=%r).\n"
  sys.stderr.write(msg % fd)
  sys.stderr.flush()
- cls._fds_not_a_terminal.add(fd)
+ if fd is not None:
+ cls._fds_not_a_terminal.add(fd)
 
  def get_size() -> Size:
  # If terminal (incorrectly) reports its size as 0, pick a

tools/debug_win_input.py renamed to tools/debug_input_cross_platform.py

@@ -1,17 +1,19 @@
 #!/usr/bin/env python
 """
-Read Windows input and print keys.
+Read input and print keys.
 For testing terminal input.
+
+Works on both Windows and Posix.
 """
 import asyncio
 
-from prompt_toolkit.input.win32 import Win32Input
+from prompt_toolkit.input import create_input
 from prompt_toolkit.keys import Keys
 
 
-async def main():
- input = Win32Input()
+async def main() -> None:
  done = asyncio.Event()
+ input = create_input()
 
  def keys_ready():
  for key_press in input.read_keys():

tools/debug_vt100_input.py

@@ -2,6 +2,8 @@
 """
 Parse vt100 input and print keys.
 For testing terminal input.
+
+(This does not use the `Input` implementation, but only the `Vt100Parser`.)
 """
 import sys