From 2e8ef66496aca76e9d20b86af5609292754c5f43 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 8 Nov 2022 17:12:49 +0530 Subject: [PATCH] Another mypy update another round of spurious errors --- kitty/layout/base.py | 4 ++-- kitty/layout/grid.py | 2 +- kitty/search_query_parser.py | 4 ++-- kitty/utils.py | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kitty/layout/base.py b/kitty/layout/base.py index e502ed210..7e035034e 100644 --- a/kitty/layout/base.py +++ b/kitty/layout/base.py @@ -192,7 +192,7 @@ def safe_increment_bias(old_val: float, increment: float) -> float: def normalize_biases(biases: List[float]) -> List[float]: s = sum(biases) - if s == 1: + if s == 1.0: return biases return [x/s for x in biases] @@ -212,7 +212,7 @@ def distribute_indexed_bias(base_bias: Sequence[float], index_bias_map: Dict[int class Layout: - name: Optional[str] = None + name: str = '' needs_window_borders = True must_draw_borders = False # can be overridden to customize behavior from kittens layout_opts = LayoutOpts({}) diff --git a/kitty/layout/grid.py b/kitty/layout/grid.py index 552422b04..943eecba5 100644 --- a/kitty/layout/grid.py +++ b/kitty/layout/grid.py @@ -36,7 +36,7 @@ def calc_grid_size(n: int) -> Tuple[int, int, int, int]: class Grid(Layout): - name = 'grid' + name: str = 'grid' no_minimal_window_borders = True def remove_all_biases(self) -> bool: diff --git a/kitty/search_query_parser.py b/kitty/search_query_parser.py index bd89cdb86..3a3259572 100644 --- a/kitty/search_query_parser.py +++ b/kitty/search_query_parser.py @@ -47,10 +47,10 @@ class SearchTreeNode: return self(universal_set, get_matches) def __call__(self, candidates: Set[T], get_matches: GetMatches[T]) -> Set[T]: - ... + return set() def iter_token_nodes(self) -> Iterator['TokenNode']: - ... + return iter(()) class OrNode(SearchTreeNode): diff --git a/kitty/utils.py b/kitty/utils.py index 858a50be5..6a03a8ffe 100644 --- a/kitty/utils.py +++ b/kitty/utils.py @@ -506,17 +506,17 @@ def parse_address_spec(spec: str) -> Tuple[AddressFamily, Union[Tuple[str, int], def write_all(fd: int, data: Union[str, bytes], block_until_written: bool = True) -> None: if isinstance(data, str): data = data.encode('utf-8') - data = memoryview(data) - while data: + mvd = memoryview(data) + while len(mvd) > 0: try: - n = os.write(fd, data) + n = os.write(fd, mvd) except BlockingIOError: if not block_until_written: raise continue if not n: break - data = data[n:] + mvd = mvd[n:] class TTYIO: