...

kovidgoyal · Dec 9, 2024 · 41c9e39 · 41c9e39
1 parent e4a0587
commit 41c9e39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/kitty/fonts/render.py b/kitty/fonts/render.py
@@ -166,7 +166,7 @@ def create_narrow_symbols(opts: Options) -> tuple[tuple[int, int, int], ...]:
 descriptor_overrides: dict[int, tuple[str, bool, bool]] = {}
 
 
-def descriptor_for_idx(idx: int) -> tuple[Union[FontObject | str], bool, bool]:
+def descriptor_for_idx(idx: int) -> tuple[Union[FontObject, str], bool, bool]:
     ans = descriptor_overrides.get(idx)
     if ans is None:
         return current_faces[idx]

diff --git a/kitty_tests/fonts.py b/kitty_tests/fonts.py
@@ -235,7 +235,11 @@ def multiline_render(text, scale=1, width=1, **kw):
         return ans
 
     def block_test(*expected, **kw):
-        for i, (expected, actual) in enumerate(zip(expected, multiline_render(kw.pop('text', '█'), **kw), strict=True)):
+        try:
+            z = zip(expected, multiline_render(kw.pop('text', '█'), **kw), strict=True)
+        except TypeError:
+            z = zip(expected, multiline_render(kw.pop('text', '█'), **kw))
+        for i, (expected, actual) in enumerate(z):
             assert_blocks(expected(), actual, f'Block {i} is not equal')