Cleanup

Author: Dreamsorcerer

invoke/collection.py

@@ -113,9 +113,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         for name, obj in kwargs.items():
             self._add_object(obj, name)
 
-    def _add_object(
-        self, obj: Any, name: Optional[str] = None
-    ) -> None:
+    def _add_object(self, obj: Any, name: Optional[str] = None) -> None:
         method: Callable[[Any, Optional[str]], None]
         if isinstance(obj, Task):
             method = self.add_task

invoke/config.py

@@ -1173,7 +1173,7 @@ class AmbiguousMergeError(ValueError):
 
 def merge_dicts(
     base: Dict[str, _T], updates: Optional[Dict[str, _T]]
-) -> Dict[str, Union[_T]]:
+) -> Dict[str, _T]:
     """
     Recursively merge dict ``updates`` into dict ``base`` (mutating ``base``.)
 

invoke/parser/parser.py

@@ -115,7 +115,8 @@ def parse_argv(self, argv: List[str]) -> ParseResult:
         .. versionadded:: 1.0
         """
         machine = ParseMachine(
-            initial=self.initial,  # type: ignore[arg-type] # FIXME: should not be none
+            # FIXME: initial should not be none
+            initial=self.initial,  # type: ignore[arg-type]
             contexts=self.contexts,
             ignore_unknown=self.ignore_unknown,
         )

invoke/terminals.py

@@ -44,9 +44,6 @@
     import termios
     import tty
 
-# Mypy bug: https://github.com/python/mypy/issues/14605
-# mypy: disable_error_code=name-defined
-
 
 if sys.platform == "win32":