Make valid typehints for *args **kwargs (#69)

* Make valid typehints for *args **kwargs
* do not lookup for pyi

Author: penguinolog

exec_helpers/_ssh_client_base.py

@@ -94,7 +94,7 @@ def __prepare__(  # pylint: disable=unused-argument
         mcs: typing.Type['_MemorizedSSH'],
         name: str,
         bases: typing.Iterable[typing.Type],
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> collections.OrderedDict:
         """Metaclass magic for object storage.
 
@@ -565,7 +565,7 @@ def execute_async(
         open_stderr: bool = True,
         verbose: bool = False,
         log_mask_re: typing.Optional[str] = None,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> _type_execute_async:
         """Execute command in async mode and return channel with IO objects.
 
@@ -646,7 +646,7 @@ def _exec_command(
         timeout: typing.Union[int, float, None],
         verbose: bool = False,
         log_mask_re: typing.Optional[str] = None,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> exec_result.ExecResult:
         """Get exit status from channel with timeout.
 
@@ -746,7 +746,7 @@ def execute_through_host(
         verbose: bool = False,
         timeout: typing.Union[int, float, None] = constants.DEFAULT_TIMEOUT,
         get_pty: bool = False,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> exec_result.ExecResult:
         """Execute command on remote host through currently connected host.
 
@@ -770,7 +770,7 @@ def execute_through_host(
         .. versionchanged:: 1.2.0 default timeout 1 hour
         .. versionchanged:: 1.2.0 log_mask_re regex rule for masking cmd
         """
-        cmd_for_log = self._mask_command(  # type: ignore
+        cmd_for_log = self._mask_command(
             cmd=command,
             log_mask_re=kwargs.get('log_mask_re', None)
         )
@@ -808,7 +808,7 @@ def execute_through_host(
         channel.exec_command(command)  # nosec  # Sanitize on caller side
 
         # noinspection PyDictCreation
-        result = self._exec_command(  # type: ignore
+        result = self._exec_command(
             command, channel, stdout, stderr, timeout, verbose=verbose,
             log_mask_re=kwargs.get('log_mask_re', None),
         )
@@ -825,7 +825,7 @@ def execute_together(
         timeout: typing.Union[int, float, None] = constants.DEFAULT_TIMEOUT,
         expected: typing.Optional[typing.Iterable[int]] = None,
         raise_on_err: bool = True,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> typing.Dict[typing.Tuple[str, int], exec_result.ExecResult]:
         """Execute command on multiple remotes in async mode.
 
@@ -855,7 +855,7 @@ def get_result(remote: 'SSHClientBase') -> exec_result.ExecResult:
                 _,
                 stderr,
                 stdout,
-            ) = remote.execute_async(  # type: ignore
+            ) = remote.execute_async(
                 command,
                 **kwargs
             )  # type: _type_execute_async
@@ -864,7 +864,7 @@ def get_result(remote: 'SSHClientBase') -> exec_result.ExecResult:
             exit_code = chan.recv_exit_status()
 
             # pylint: disable=protected-access
-            cmd_for_log = remote._mask_command(  # type: ignore
+            cmd_for_log = remote._mask_command(
                 cmd=command,
                 log_mask_re=kwargs.get('log_mask_re', None)
             )

exec_helpers/api.py

@@ -134,7 +134,7 @@ def execute_async(
         open_stderr: bool = True,
         verbose: bool = False,
         log_mask_re: typing.Optional[str] = None,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> typing.Tuple[typing.Any, typing.Any, typing.Any, typing.Any]:
         """Execute command in async mode and return remote interface with IO objects.
 
@@ -167,7 +167,7 @@ def _exec_command(
         timeout: typing.Union[int, float, None],
         verbose: bool = False,
         log_mask_re: typing.Optional[str] = None,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> exec_result.ExecResult:
         """Get exit status from channel with timeout.
 
@@ -198,7 +198,7 @@ def execute(
         command: str,
         verbose: bool = False,
         timeout: typing.Union[int, float, None] = constants.DEFAULT_TIMEOUT,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> exec_result.ExecResult:
         """Execute command and wait for return code.
 
@@ -221,13 +221,13 @@ def execute(
                 _,
                 stderr,
                 stdout,
-            ) = self.execute_async(  # type: ignore
+            ) = self.execute_async(
                 command,
                 verbose=verbose,
                 **kwargs
             )
 
-            result = self._exec_command(  # type: ignore
+            result = self._exec_command(
                 command=command,
                 interface=iface,
                 stdout=stdout,
@@ -251,7 +251,7 @@ def check_call(
         error_info: typing.Optional[str] = None,
         expected: typing.Optional[typing.Iterable[typing.Union[int, proc_enums.ExitCodes]]] = None,
         raise_on_err: bool = True,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> exec_result.ExecResult:
         """Execute command and check for return code.
 
@@ -300,7 +300,7 @@ def check_stderr(
         timeout: typing.Union[int, float, None] = constants.DEFAULT_TIMEOUT,
         error_info: typing.Optional[str] = None,
         raise_on_err: bool = True,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> exec_result.ExecResult:
         """Execute command expecting return code 0 and empty STDERR.
 
@@ -334,7 +334,7 @@ def check_stderr(
                 ))
             self.logger.error(message)
             if raise_on_err:
-                raise exceptions.CalledProcessError(  # type: ignore
+                raise exceptions.CalledProcessError(
                     result=ret,
                     expected=kwargs.get('expected'),
                 )

exec_helpers/subprocess_runner.py

@@ -43,7 +43,7 @@ class SingletonMeta(type):
     _instances = {}  # type: typing.Dict[typing.Type, typing.Any]
     _lock = threading.RLock()  # type: threading.RLock
 
-    def __call__(cls: 'SingletonMeta', *args: typing.Tuple, **kwargs: typing.Dict) -> typing.Any:
+    def __call__(cls: 'SingletonMeta', *args: typing.Any, **kwargs: typing.Any) -> typing.Any:
         """Singleton."""
         with cls._lock:
             if cls not in cls._instances:
@@ -56,7 +56,7 @@ def __prepare__(  # pylint: disable=unused-argument
         mcs: typing.Type['SingletonMeta'],
         name: str,
         bases: typing.Iterable[typing.Type],
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> collections.OrderedDict:
         """Metaclass magic for object storage.
 
@@ -91,7 +91,7 @@ def _exec_command(
         timeout: typing.Union[int, float, None],
         verbose: bool = False,
         log_mask_re: typing.Optional[str] = None,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> exec_result.ExecResult:
         """Get exit status from channel with timeout.
 
@@ -184,7 +184,7 @@ def execute_async(  # pylint: disable=signature-differs
         open_stderr: bool = True,
         verbose: bool = False,
         log_mask_re: typing.Optional[str] = None,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> typing.Tuple[subprocess.Popen, None, None, None]:
         """Overload: with stdin."""
         pass  # pragma: no cover
@@ -198,7 +198,7 @@ def execute_async(
         open_stderr: bool = True,
         verbose: bool = False,
         log_mask_re: typing.Optional[str] = None,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> typing.Tuple[subprocess.Popen, None, typing.IO, typing.IO]:
         """Overload: no stdin."""
         pass  # pragma: no cover
@@ -212,7 +212,7 @@ def execute_async(  # type: ignore  # noqa: F811
         open_stderr: bool = True,
         verbose: bool = False,
         log_mask_re: typing.Optional[str] = None,
-        **kwargs: typing.Dict
+        **kwargs: typing.Any
     ) -> typing.Tuple[subprocess.Popen, None, typing.Optional[typing.IO], typing.Optional[typing.IO]]:
         """Execute command in async mode and return Popen with IO objects.
 
@@ -245,7 +245,7 @@ def execute_async(  # type: ignore  # noqa: F811
             msg=_log_templates.CMD_EXEC.format(cmd=cmd_for_log)
         )
 
-        process = subprocess.Popen(  # type: ignore
+        process = subprocess.Popen(
             args=[command],
             stdout=subprocess.PIPE if open_stdout else subprocess.DEVNULL,
             stderr=subprocess.PIPE if open_stderr else subprocess.DEVNULL,

setup.py

@@ -25,7 +25,6 @@
 import collections
 from distutils.command import build_ext
 import distutils.errors
-import glob
 import os.path
 import shutil
 import sys
@@ -270,12 +269,7 @@ def get_simple_vars_from_src(src):
                    "!=36.2.0",
     install_requires=required,
     package_data={
-        str('exec_helpers'): [
-            os.path.basename(filename)
-            for filename in glob.glob(os.path.join('exec_helpers', '*.pyi'))
-        ] + [
-            'py.typed'
-        ],
+        'exec_helpers': ['py.typed'],
     },
 )
 if cythonize is not None: