From 6549dbe8172783a82d3b856b5e1df2cb7bc9a7d5 Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Sat, 3 Nov 2018 01:08:20 +0100
Subject: [PATCH] ui: correct mypy definitions

---
 pqcli/ui/__init__.py      | 2 +-
 pqcli/ui/button.py        | 4 +++-
 pqcli/ui/exit_view.py     | 8 ++++----
 pqcli/ui/new_game_view.py | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pqcli/ui/__init__.py b/pqcli/ui/__init__.py
index 948545d..4215506 100644
--- a/pqcli/ui/__init__.py
+++ b/pqcli/ui/__init__.py
@@ -19,7 +19,7 @@ for key, direction in {
 urwid.command_map["tab"] = f"cursor down"
 urwid.command_map["shift tab"] = f"cursor up"
 
-PALETTE: T.List[T.Tuple[str]] = [
+PALETTE: T.List[T.Tuple[str, str, str]] = [
     ("button", "", ""),
     ("button-focus", "light red", "black"),
     ("linebox", "", ""),
diff --git a/pqcli/ui/button.py b/pqcli/ui/button.py
index 6dccc0f..a1abadc 100644
--- a/pqcli/ui/button.py
+++ b/pqcli/ui/button.py
@@ -1,8 +1,10 @@
+import typing as T
+
 import urwid
 
 
 class MenuButton(urwid.Button):
-    def __init__(self, label, *args, **kwargs):
+    def __init__(self, label: str, *args: T.Any, **kwargs: T.Any) -> None:
         super().__init__("", *args, **kwargs)
         self._w = urwid.AttrMap(
             urwid.SelectableIcon(["\N{BULLET} ", label], 2),
diff --git a/pqcli/ui/exit_view.py b/pqcli/ui/exit_view.py
index 7a1598a..3678b96 100644
--- a/pqcli/ui/exit_view.py
+++ b/pqcli/ui/exit_view.py
@@ -25,11 +25,11 @@ class ExitView(urwid.Overlay):
 
         super().__init__(line_box, parent, "center", 20, "middle", 5)
 
-    def keypress(self, size: T.Any, key: str) -> bool:
+    def keypress(self, size: T.Any, key: str) -> T.Optional[str]:
         if key in {"y", "Y"}:
             self.on_exit()
-            return True
+            return None
         if key in {"n", "N"}:
             self.on_cancel()
-            return True
-        return super().keypress(size, key)
+            return None
+        return key
diff --git a/pqcli/ui/new_game_view.py b/pqcli/ui/new_game_view.py
index 2321ac4..ae8b0e4 100644
--- a/pqcli/ui/new_game_view.py
+++ b/pqcli/ui/new_game_view.py
@@ -79,7 +79,7 @@ class StatsBox(urwid.Filler):
 
 class RaceBox(LineBox):
     def __init__(self) -> None:
-        race_checkboxes = []
+        race_checkboxes: T.List[urwid.RadioButton] = []
         self.race = random.choice(RACES)
         for race in RACES:
             urwid.RadioButton(
@@ -92,7 +92,7 @@ class RaceBox(LineBox):
 
 class ClassBox(LineBox):
     def __init__(self) -> None:
-        class_checkboxes = []
+        class_checkboxes: T.List[urwid.RadioButton] = []
         self.class_ = random.choice(CLASSES)
         for class_ in CLASSES:
             urwid.RadioButton(