Merge pull request #1060 from python-cmd2/mypy

Start making small changes to fix mypy warnings

Author: tleonhardt

Pipfile

@@ -22,6 +22,7 @@ invoke = "*"
 ipython = "*"
 isort = "*"
 mock = {version = "*",markers = "python_version < '3.6'"}
+mypy = "*"
 plumbum = "*"
 pyreadline = {version = "*",sys_platform = "== 'win32'",markers = "python_version < '3.8'"}
 pyreadline3 = {version = "*",sys_platform = "== 'win32'",markers = "python_version >= '3.8'"}

cmd2/argparse_custom.py

@@ -203,6 +203,7 @@ def my_completer(self, text, line, begidx, endidx, arg_tokens)
 from typing import (
     Any,
     Callable,
+    NoReturn,
     Optional,
     Tuple,
     Type,
@@ -264,7 +265,7 @@ def __new__(cls, value: object, *args, **kwargs) -> str:
         return super().__new__(cls, value)
 
     # noinspection PyUnusedLocal
-    def __init__(self, value: object, desc: str = '', *args, **kwargs) -> None:
+    def __init__(self, value: object, desc: str = '', *args) -> None:
         """
         CompletionItem Initializer
 
@@ -273,7 +274,7 @@ def __init__(self, value: object, desc: str = '', *args, **kwargs) -> None:
         :param args: args for str __init__
         :param kwargs: kwargs for str __init__
         """
-        super().__init__(*args, **kwargs)
+        super().__init__(*args)
         self.description = desc
 
 
@@ -340,7 +341,7 @@ def set_completer(action: argparse.Action, completer: Callable) -> None:
 def _add_argument_wrapper(
     self,
     *args,
-    nargs: Union[int, str, Tuple[int], Tuple[int, int], None] = None,
+    nargs: Union[int, str, Tuple[int], Tuple[int, int], Tuple[int, float], None] = None,
     choices_provider: Optional[Callable] = None,
     completer: Optional[Callable] = None,
     suppress_tab_hint: bool = False,
@@ -812,7 +813,7 @@ def add_subparsers(self, **kwargs):
 
         return super().add_subparsers(**kwargs)
 
-    def error(self, message: str) -> None:
+    def error(self, message: str) -> NoReturn:
         """Custom override that applies custom formatting to the error message"""
         lines = message.split('\n')
         linum = 0

cmd2/exceptions.py

@@ -49,7 +49,7 @@ class CompletionError(Exception):
     - Tab completion hints
     """
 
-    def __init__(self, *args, apply_style: bool = True, **kwargs):
+    def __init__(self, *args, apply_style: bool = True):
         """
         Initializer for CompletionError
         :param apply_style: If True, then ansi.style_error will be applied to the message text when printed.
@@ -59,7 +59,7 @@ def __init__(self, *args, apply_style: bool = True, **kwargs):
         self.apply_style = apply_style
 
         # noinspection PyArgumentList
-        super().__init__(*args, **kwargs)
+        super().__init__(*args)
 
 
 ############################################################################################################

cmd2/transcript.py

@@ -60,6 +60,9 @@ def _fetchTranscripts(self):
             tfile.close()
 
     def _test_transcript(self, fname: str, transcript):
+        if self.cmdapp is None:
+            return
+
         line_num = 0
         finished = False
         line = ansi.strip_style(next(transcript))

cmd2/utils.py

@@ -24,6 +24,7 @@
     Dict,
     Iterable,
     List,
+    NamedTuple,
     Optional,
     TextIO,
     Type,
@@ -161,7 +162,7 @@ def namedtuple_with_defaults(typename: str, field_names: Union[str, List[str]],
         >>> Node(4)
         Node(val=4, left=None, right=7)
     """
-    T = collections.namedtuple(typename, field_names)
+    T: NamedTuple = collections.namedtuple(typename, field_names)
     # noinspection PyProtectedMember,PyUnresolvedReferences
     T.__new__.__defaults__ = (None,) * len(T._fields)
     if isinstance(default_values, collections_abc.Mapping):
@@ -353,7 +354,13 @@ def find_editor() -> Optional[str]:
         else:
             editors = ['vim', 'vi', 'emacs', 'nano', 'pico', 'joe', 'code', 'subl', 'atom', 'gedit', 'geany', 'kate']
 
-        paths = [p for p in os.getenv('PATH').split(os.path.pathsep) if not os.path.islink(p)]
+        # Get a list of every directory in the PATH environment variable and ignore symbolic links
+        env_path = os.getenv('PATH')
+        if env_path is None:
+            paths = []
+        else:
+            paths = [p for p in env_path.split(os.path.pathsep) if not os.path.islink(p)]
+
         for editor, path in itertools.product(editors, paths):
             editor_path = os.path.join(path, editor)
             if os.path.isfile(editor_path) and os.access(editor_path, os.X_OK):
@@ -408,7 +415,11 @@ def get_exes_in_path(starts_with: str) -> List[str]:
             return []
 
     # Get a list of every directory in the PATH environment variable and ignore symbolic links
-    paths = [p for p in os.getenv('PATH').split(os.path.pathsep) if not os.path.islink(p)]
+    env_path = os.getenv('PATH')
+    if env_path is None:
+        paths = []
+    else:
+        paths = [p for p in env_path.split(os.path.pathsep) if not os.path.islink(p)]
 
     # Use a set to store exe names since there can be duplicates
     exes_set = set()