Use Optional, CR

thomasballinger · thomasballinger · commit 3514a7d58ed3 · 2021-10-10T08:24:23.000-07:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -66,7 +66,7 @@ class AutocompleteModes(Enum):
     FUZZY = "fuzzy"
 
     @classmethod
-    def from_string(cls, value: str) -> Union[Any, None]:
+    def from_string(cls, value: str) -> Optional[Any]:
         if value.upper() in cls.__members__:
             return cls.__members__[value.upper()]
         return None
@@ -209,7 +209,7 @@ def method_match_substring(word: str, size: int, text: str) -> bool:
     return text in word
 
 
-def method_match_fuzzy(word: str, size: int, text: str) -> Union[Match, None]:
+def method_match_fuzzy(word: str, size: int, text: str) -> Optional[Match]:
     s = r".*%s.*" % ".*".join(list(text))
     return re.search(s, word)
 
@@ -236,7 +236,7 @@ def __init__(
     @abc.abstractmethod
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[Set[str], None]:
+    ) -> Optional[Set[str]]:
         """Returns a list of possible matches given a line and cursor, or None
         if this completion type isn't applicable.
 
@@ -255,7 +255,7 @@ def matches(
         raise NotImplementedError
 
     @abc.abstractmethod
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         """Returns a Linepart namedtuple instance or None given cursor and line
 
         A Linepart namedtuple contains a start, stop, and word. None is
@@ -299,7 +299,7 @@ def __init__(
 
         super().__init__(True, mode)
 
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         for completer in self._completers:
             return_value = completer.locate(cursor_offset, line)
             if return_value is not None:
@@ -311,7 +311,7 @@ def format(self, word: str) -> str:
 
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         return_value = None
         all_matches = set()
         for completer in self._completers:
@@ -336,10 +336,10 @@ def __init__(
 
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         return self.module_gatherer.complete(cursor_offset, line)
 
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         return lineparts.current_word(cursor_offset, line)
 
     def format(self, word: str) -> str:
@@ -355,7 +355,7 @@ def safe_glob(self, pathname: str) -> Iterator[str]:
 
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         cs = lineparts.current_string(cursor_offset, line)
         if cs is None:
             return None
@@ -370,7 +370,7 @@ def matches(
             matches.add(filename)
         return matches
 
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         return lineparts.current_string(cursor_offset, line)
 
     def format(self, filename: str) -> str:
@@ -387,7 +387,7 @@ class AttrCompletion(BaseCompletionType):
 
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         if "locals_" not in kwargs:
             return None
         locals_ = cast(Dict[str, Any], kwargs["locals_"])
@@ -417,7 +417,7 @@ def matches(
             if few_enough_underscores(r.word.split(".")[-1], m.split(".")[-1])
         }
 
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         return lineparts.current_dotted_attribute(cursor_offset, line)
 
     def format(self, word: str) -> str:
@@ -472,7 +472,7 @@ def list_attributes(self, obj: Any) -> List[str]:
 class DictKeyCompletion(BaseCompletionType):
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         if "locals_" not in kwargs:
             return None
         locals_ = kwargs["locals_"]
@@ -495,7 +495,7 @@ def matches(
         else:
             return None
 
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         return lineparts.current_dict_key(cursor_offset, line)
 
     def format(self, match: str) -> str:
@@ -505,7 +505,7 @@ def format(self, match: str) -> str:
 class MagicMethodCompletion(BaseCompletionType):
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         if "current_block" not in kwargs:
             return None
         current_block = kwargs["current_block"]
@@ -517,14 +517,14 @@ def matches(
             return None
         return {name for name in MAGIC_METHODS if name.startswith(r.word)}
 
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         return lineparts.current_method_definition_name(cursor_offset, line)
 
 
 class GlobalCompletion(BaseCompletionType):
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         """Compute matches when text is a simple name.
         Return a list of all keywords, built-in functions and names currently
         defined in self.namespace that match.
@@ -554,14 +554,14 @@ def matches(
                     matches.add(_callable_postfix(val, word))
         return matches if matches else None
 
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         return lineparts.current_single_word(cursor_offset, line)
 
 
 class ParameterNameCompletion(BaseCompletionType):
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         if "argspec" not in kwargs:
             return None
         argspec = kwargs["argspec"]
@@ -582,18 +582,18 @@ def matches(
             )
         return matches if matches else None
 
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         return lineparts.current_word(cursor_offset, line)
 
 
 class ExpressionAttributeCompletion(AttrCompletion):
     # could replace attr completion as a more general case with some work
-    def locate(self, cursor_offset: int, line: str) -> Union[LinePart, None]:
+    def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
         return lineparts.current_expression_attribute(cursor_offset, line)
 
     def matches(
         self, cursor_offset: int, line: str, **kwargs: Any
-    ) -> Union[None, Set]:
+    ) -> Optional[Set]:
         if "locals_" not in kwargs:
             return None
         locals_ = kwargs["locals_"]
@@ -621,23 +621,21 @@ def matches(
     class MultilineJediCompletion(BaseCompletionType):  # type: ignore [no-redef]
         def matches(
             self, cursor_offset: int, line: str, **kwargs: Any
-        ) -> Union[None, Set]:
+        ) -> Optional[Set]:
             return None
 
-        def locate(
-            self, cursor_offset: int, line: str
-        ) -> Union[LinePart, None]:
+        def locate(self, cursor_offset: int, line: str) -> Optional[LinePart]:
             return None
 
 
 else:
 
     class JediCompletion(BaseCompletionType):
-        _orig_start: Union[int, None]
+        _orig_start: Optional[int]
 
         def matches(
             self, cursor_offset: int, line: str, **kwargs: Any
-        ) -> Union[None, Set]:
+        ) -> Optional[Set]:
             if "history" not in kwargs:
                 return None
             history = kwargs["history"]
@@ -687,7 +685,7 @@ def locate(self, cursor_offset: int, line: str) -> LinePart:
     class MultilineJediCompletion(JediCompletion):  # type: ignore [no-redef]
         def matches(
             self, cursor_offset: int, line: str, **kwargs: Any
-        ) -> Union[None, Set]:
+        ) -> Optional[Set]:
             if "current_block" not in kwargs or "history" not in kwargs:
                 return None
             current_block = kwargs["current_block"]
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -51,7 +51,6 @@
 import sys
 import time
 from typing import Iterator, NoReturn, List
-from typing_extensions import Literal
 import unicodedata
 from dataclasses import dataclass
 
@@ -145,7 +144,7 @@ def writelines(self, l) -> None:
         for s in l:
             self.write(s)
 
-    def isatty(self) -> Literal[True]:
+    def isatty(self) -> bool:
         # some third party (amongst them mercurial) depend on this
         return True
 
@@ -176,7 +175,7 @@ def write(self, value) -> NoReturn:
         # others, so here's a hack to keep them happy
         raise OSError(errno.EBADF, "sys.stdin is read-only")
 
-    def isatty(self) -> Literal[True]:
+    def isatty(self) -> bool:
         return True
 
     def readline(self, size=-1):
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -40,7 +40,7 @@
 
 class SupportsEventGeneration(Protocol):
     def send(
-        self, timeout: Union[float, None]
+        self, timeout: Optional[float]
     ) -> Union[str, curtsies.events.Event, None]:
         ...
 
@@ -253,9 +253,7 @@ def curtsies_arguments(parser: argparse._ArgumentGroup) -> None:
 
 def _combined_events(
     event_provider: "SupportsEventGeneration", paste_threshold: int
-) -> Generator[
-    Union[str, curtsies.events.Event, None], Union[float, None], None
-]:
+) -> Generator[Union[str, curtsies.events.Event, None], Optional[float], None]:
     """Combines consecutive keypress events into paste events."""
     timeout = yield "nonsense_event"  # so send can be used immediately
     queue: collections.deque = collections.deque()
diff --git a/bpython/curtsiesfrontend/interaction.py b/bpython/curtsiesfrontend/interaction.py
@@ -1,6 +1,5 @@
 import greenlet
 import time
-from typing import Optional
 from curtsies import events
 
 from ..translations import _
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -14,7 +14,6 @@
 from enum import Enum
 
 from typing import Dict, Any, List, Optional, Tuple, Union, cast
-from typing_extensions import Literal
 
 import blessings
 import cwcwidth
@@ -60,8 +59,6 @@
 )
 from ..translations import _
 
-InputOrOutput = Union[Literal["input"], Literal["output"]]
-
 logger = logging.getLogger(__name__)
 
 INCONSISTENT_HISTORY_MSG = "#<---History inconsistent with output shown--->"
@@ -286,7 +283,7 @@ def _process_ps(ps, default_ps: str):
     if not isinstance(ps, str):
         return ps
 
-    return ps if cwcwidth.wcswidth(ps) >= 0 else default_ps
+    return ps if cwcwidth.wcswidth(ps, None) >= 0 else default_ps
 
 
 class BaseRepl(Repl):
@@ -387,8 +384,8 @@ def __init__(
         # Entries are tuples, where
         #   - the first element the line (string, not fmtsr)
         #   - the second element is one of 2 global constants: "input" or "output"
-        #     (use LineTypeTranslator.INPUT or LineTypeTranslator.OUTPUT to avoid typing these strings)
-        self.all_logical_lines: List[Tuple[str, InputOrOutput]] = []
+        #     (use LineType.INPUT or LineType.OUTPUT to avoid typing these strings)
+        self.all_logical_lines: List[Tuple[str, LineType]] = []
 
         # formatted version of lines in the buffer kept around so we can
         # unhighlight parens using self.reprint_line as called by bpython.Repl
@@ -1629,8 +1626,8 @@ def move_screen_up(current_line_start_row):
             )
         else:  # Common case for determining cursor position
             cursor_row, cursor_column = divmod(
-                wcswidth(self.current_cursor_line_without_suggestion.s)
-                - wcswidth(self.current_line)
+                wcswidth(self.current_cursor_line_without_suggestion.s, None)
+                - wcswidth(self.current_line, None)
                 + wcswidth(self.current_line, max(0, self.cursor_offset))
                 + self.number_of_padding_chars_on_current_cursor_line(),
                 width,
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -2,9 +2,6 @@
 import sys
 import unittest
 
-from typing import Optional
-from types import ModuleType
-
 from bpython import inspection
 from bpython.test.fodder import encoding_ascii
 from bpython.test.fodder import encoding_latin1
diff --git a/stubs/cwcwidth.pyi b/stubs/cwcwidth.pyi
