From 971d4ba141459f78d10d5770b9459d1ead7d49a0 Mon Sep 17 00:00:00 2001 From: Scott Date: Wed, 2 Feb 2022 08:31:42 -0800 Subject: More mypy cleanup. --- text_utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'text_utils.py') 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)) -- cgit v1.3