Refactors typing

Author: jkwill87

teletype/__version__.py

@@ -1 +1 @@
-VERSION = "1.3.3"
+VERSION = "1.3.4"

teletype/components.py

@@ -2,7 +2,7 @@
 from typing import Any, Dict, Generic, Iterable, List, Optional, Set, Tuple, Union
 
 from teletype import codes, io
-from teletype.typing import TSTYLE, V
+from teletype.typedef import TSTYLE, V
 
 __all__ = [
     "SelectOne",
@@ -94,9 +94,6 @@ def mnemonic(self, m: Optional[str]):
             raise ValueError("mnemonic not present in value or label")
 
 
-ChoiceParam = Union[str, int, ChoiceHelper]
-
-
 class SelectOne:
     """Allows the user to make a single selection
 
@@ -107,27 +104,27 @@ class SelectOne:
 
     _multiselect = False
 
-    def __init__(self, choices: Iterable[ChoiceParam], **chars: str):
+    def __init__(self, choices: Iterable, **chars: str):
         self.chars = codes.CHARS_DEFAULT.copy()
         self.chars.update(chars)
         self._mnemonic_idx_map: Dict[str, int] = {}
-        self._choices: List[ChoiceParam] = []
+        self._choices: List[Any] = []
         for choice in choices:
             if choice in self._choices:
                 continue
             self._choices.append(choice)
             if isinstance(choice, ChoiceHelper) and choice.mnemonic:
                 self._mnemonic_idx_map[choice.mnemonic] = len(self._mnemonic_idx_map)
         self._line = 0
-        self._selected_lines: Set[str] = set()
+        self._selected_lines: Set[int] = set()
 
     def __len__(self):
         return len(self.choices)
 
     def __hash__(self):
         return self.choices.__hash__()
 
-    def _display_choice(self, idx: int, choice: ChoiceParam):
+    def _display_choice(self, idx: int, choice: Any):
         print(" %s %s" % (self.chars["arrow"] if idx == 0 else " ", choice))
 
     def _select_line(self):
@@ -185,15 +182,15 @@ def _process_keypress(self):
                 raise KeyboardInterrupt("%s pressed" % key)
 
     @staticmethod
-    def _strip_choice(choice: ChoiceParam) -> Any:
+    def _strip_choice(choice: Any) -> Any:
         if isinstance(choice, str):
             return io.strip_format(choice)
         if isinstance(choice, ChoiceHelper):
             return choice.value
         return choice
 
     @property
-    def choices(self) -> Tuple[ChoiceParam, ...]:
+    def choices(self) -> Tuple:
         """Returns read-only tuple of choices"""
         return tuple(self._choices)
 

teletype/io/common.py

@@ -3,7 +3,7 @@
 from typing import Any, Optional
 
 from teletype import codes
-from teletype.typing import TSTYLE
+from teletype.typedef import TSTYLE
 
 __all__ = [
     "erase_lines",