proxy terminal fixups

haliphax · Feb 28, 2023 · 81fec9a · 81fec9a
1 parent af4246e
commit 81fec9a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/xthulu/terminal/proxy_call.py b/xthulu/terminal/proxy_call.py
@@ -22,3 +22,6 @@ def __call__(self, *args, **kwargs):
         self.pipe_master.send((f"!CALL{self.attr}", args, kwargs))
 
         return self.pipe_master.recv()
+
+    def __str__(self):
+        return self.__call__()
diff --git a/xthulu/terminal/proxy_terminal.py b/xthulu/terminal/proxy_terminal.py
@@ -1,7 +1,7 @@
 """Proxied blessed.Terminal"""
 
 # type checking
-from typing import Any, Callable
+from typing import Any
 
 # stdlib
 from asyncio import IncompleteReadError, TimeoutError, Queue, wait_for
@@ -50,6 +50,9 @@ class ProxyTerminal:
     location: contextlib._GeneratorContextManager[Any]
     raw: contextlib._GeneratorContextManager[Any]
 
+    # other type hints for non-callable proxies
+    normal: str
+
     def __init__(
         self,
         stdin: Queue[bytes],
@@ -69,7 +72,7 @@ def __init__(
         self._pixel_width = pixel_width
         self._pixel_height = pixel_height
 
-    def __getattr__(self, attr: str) -> Callable[..., str]:
+    def __getattr__(self, attr: str) -> TerminalProxyCall:
         @contextlib.contextmanager
         def proxy_contextmanager(*args, **kwargs):
             # we send special '!CTX' header, which means we