X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=text_utils.py;h=0d07905be78daeb273995a0b5e131722e6e344d5;hb=a4bf4d05230474ad14243d67ac7f8c938f670e58;hp=741e2a30dacd94306ac79a9c1cce4cc416b67e3f;hpb=9313acd7f50f19dfa3a3ff32f686c924b4cfe75a;p=python_utils.git

diff --git a/text_utils.py b/text_utils.py
index 741e2a3..0d07905 100644
--- a/text_utils.py
+++ b/text_utils.py
@@ -6,7 +6,7 @@ from collections import defaultdict
 import logging
 import math
 import sys
-from typing import List, NamedTuple, Optional
+from typing import Dict, Generator, List, NamedTuple, Optional
 
 from ansi import fg, reset
 
@@ -22,10 +22,10 @@ class RowsColumns(NamedTuple):
 def get_console_rows_columns() -> RowsColumns:
     """Returns the number of rows/columns on the current console."""
 
-    from exec_utils import cmd_with_timeout
+    from exec_utils import cmd
 
     try:
-        rows, columns = cmd_with_timeout(
+        rows, columns = cmd(
             "stty size",
             timeout_seconds=1.0,
         ).split()
@@ -69,7 +69,7 @@ def bar_graph(
     reset=reset(),
     left_end="[",
     right_end="]",
-) -> None:
+) -> str:
     """Returns a string containing a bar graph.
 
     >>> bar_graph(0.5, fgcolor='', reset='')
@@ -217,8 +217,8 @@ def justify_text(text: str, *, width: int = 80, alignment: str = "c") -> str:
     return retval[1:]
 
 
-def generate_padded_columns(text: List[str]) -> str:
-    max_width = defaultdict(int)
+def generate_padded_columns(text: List[str]) -> Generator:
+    max_width: Dict[int, int] = defaultdict(int)
     for line in text:
         for pos, word in enumerate(line.split()):
             max_width[pos] = max(max_width[pos], len(word))