Optionally surface exceptions that happen under executors by reading

[python_utils.git] / input_utils.py

diff --git a/input_utils.py b/input_utils.py
index b19bfe16726dd5995a9d8db52cc7be49b67c8201..e0b457d5a0e73ffc43d3d83ff09228328e6a641e 100644 (file)
--- a/input_utils.py
+++ b/input_utils.py
@@ -2,11 +2,18 @@
 
 """Utilities related to user input."""
 
-import readchar  # type: ignore
+import logging
 import signal
 import sys
 from typing import List
 
+import readchar  # type: ignore
+
+import exceptions
+
+
+logger = logging.getLogger(__file__)
+
 
 def single_keystroke_response(
     valid_responses: List[str],
@@ -15,11 +22,10 @@ def single_keystroke_response(
     default_response: str = None,
     timeout_seconds: int = None,
 ) -> str:
-    class TimeoutError(Exception):
-        pass
+    """Get a single keystroke response to a prompt."""
 
     def _handle_timeout(signum, frame) -> None:
-        raise TimeoutError()
+        raise exceptions.TimeoutError()
 
     def _single_keystroke_response_internal(
         valid_responses: List[str], timeout_seconds=None
@@ -32,6 +38,7 @@ def single_keystroke_response(
         try:
             while True:
                 response = readchar.readchar()
+                logger.debug(f'Keystroke: {ord(response)}')
                 if response in valid_responses:
                     break
                 if ord(response) in os_special_keystrokes:
@@ -48,7 +55,10 @@ def single_keystroke_response(
         response = _single_keystroke_response_internal(
             valid_responses, timeout_seconds
         )
-    except TimeoutError:
+        if ord(response) == 3:
+            raise KeyboardInterrupt('User pressed ^C in input_utils.')
+
+    except exceptions.TimeoutError:
         if default_response is not None:
             response = default_response
     if prompt is not None:
@@ -57,12 +67,16 @@ def single_keystroke_response(
 
 
 def yn_response(prompt: str = None, *, timeout_seconds=None) -> str:
+    """Get a Y/N response to a prompt."""
+
     return single_keystroke_response(
         ["y", "n", "Y", "N"], prompt=prompt, timeout_seconds=timeout_seconds
     ).lower()
 
 
 def keystroke_helper() -> None:
+    """Misc util to watch keystrokes and report what they were."""
+
     print("Watching for keystrokes; ^C to quit.")
     while True:
         key = readchar.readkey()