MyPy 0.650 - new checks

(cherry picked from commit 6077362)

Author: penguinolog

.travis.yml

@@ -75,7 +75,7 @@ jobs:
     install:
     - *upgrade_python_toolset
     - *install_deps
-    - pip install --upgrade "mypy >= 0.641"
+    - pip install --upgrade "mypy >= 0.650"
     script:
     - mypy --strict exec_helpers
 

exec_helpers/_ssh_client_base.py

@@ -121,8 +121,8 @@ class _MemorizedSSH(abc.ABCMeta):
 
     @classmethod
     def __prepare__(  # pylint: disable=unused-argument
-        mcs: typing.Type["_MemorizedSSH"], name: str, bases: typing.Iterable[typing.Type], **kwargs: typing.Any
-    ) -> collections.OrderedDict:
+        mcs: typing.Type["_MemorizedSSH"], name: str, bases: typing.Iterable[type], **kwargs: typing.Any
+    ) -> "collections.OrderedDict[str, typing.Any]":
         """Metaclass magic for object storage.
 
         .. versionadded:: 1.2.0
@@ -516,7 +516,7 @@ def reconnect(self) -> None:
 
             self.__connect()
 
-    def sudo(self, enforce: typing.Optional[bool] = None) -> "typing.ContextManager":
+    def sudo(self, enforce: typing.Optional[bool] = None) -> "typing.ContextManager[None]":
         """Call contextmanager for sudo mode change.
 
         :param enforce: Enforce sudo enabled or disabled. By default: None
@@ -526,7 +526,7 @@ def sudo(self, enforce: typing.Optional[bool] = None) -> "typing.ContextManager"
         """
         return self.__get_sudo(ssh=self, enforce=enforce)
 
-    def keepalive(self, enforce: bool = True) -> "typing.ContextManager":
+    def keepalive(self, enforce: bool = True) -> "typing.ContextManager[None]":
         """Call contextmanager with keepalive mode change.
 
         :param enforce: Enforce keepalive enabled or disabled.
@@ -694,7 +694,7 @@ def poll_pipes() -> None:
 
         # pylint: disable=assignment-from-no-return
         # noinspection PyNoneFunctionAssignment
-        future = poll_pipes()  # type: concurrent.futures.Future
+        future = poll_pipes()
         # pylint: enable=assignment-from-no-return
 
         concurrent.futures.wait([future], timeout)
@@ -877,14 +877,12 @@ def get_result(remote: "SSHClientBase") -> exec_result.ExecResult:
         errors = {}
         raised_exceptions = {}
 
-        (_, not_done) = concurrent.futures.wait(
-            list(futures.values()), timeout=timeout
-        )  # type: typing.Set[concurrent.futures.Future], typing.Set[concurrent.futures.Future]
+        _, not_done = concurrent.futures.wait(list(futures.values()), timeout=timeout)
 
         for fut in not_done:  # pragma: no cover
             fut.cancel()
 
-        for (remote, future) in futures.items():  # type: SSHClientBase, concurrent.futures.Future
+        for (remote, future) in futures.items():
             try:
                 result = future.result()
                 results[(remote.hostname, remote.port)] = result

exec_helpers/exec_result.py

@@ -220,7 +220,7 @@ def _poll_stream(
 
     def read_stdout(
         self,
-        src: typing.Optional[typing.Iterable] = None,
+        src: typing.Optional[typing.Iterable[bytes]] = None,
         log: typing.Optional[logging.Logger] = None,
         verbose: bool = False,
     ) -> None:
@@ -247,7 +247,7 @@ def read_stdout(
 
     def read_stderr(
         self,
-        src: typing.Optional[typing.Iterable] = None,
+        src: typing.Optional[typing.Iterable[bytes]] = None,
         log: typing.Optional[logging.Logger] = None,
         verbose: bool = False,
     ) -> None:

exec_helpers/metaclasses.py

@@ -27,7 +27,7 @@ class SingletonMeta(abc.ABCMeta):
     Main goals: not need to implement __new__ in singleton classes
     """
 
-    _instances = {}  # type: typing.Dict[typing.Type, typing.Any]
+    _instances = {}  # type: typing.Dict[type, typing.Any]
     _lock = threading.RLock()  # type: threading.RLock
 
     def __call__(cls: "SingletonMeta", *args: typing.Any, **kwargs: typing.Any) -> typing.Any:
@@ -40,8 +40,8 @@ def __call__(cls: "SingletonMeta", *args: typing.Any, **kwargs: typing.Any) -> t
 
     @classmethod
     def __prepare__(  # pylint: disable=unused-argument
-        mcs: typing.Type["SingletonMeta"], name: str, bases: typing.Iterable[typing.Type], **kwargs: typing.Any
-    ) -> collections.OrderedDict:
+        mcs: typing.Type["SingletonMeta"], name: str, bases: typing.Iterable[type], **kwargs: typing.Any
+    ) -> "collections.OrderedDict[str, typing.Any]":
         """Metaclass magic for object storage.
 
         .. versionadded:: 1.2.0
@@ -58,8 +58,12 @@ def __init__(cls, name: str, bases: typing.Tuple[type, ...], namespace: typing.D
         cls.__lock = threading.RLock()
 
     def __new__(  # pylint: disable=arguments-differ
-        mcs, name: str, bases: typing.Tuple[type, ...], namespace: typing.Dict[str, typing.Any], **kwargs: typing.Any
-    ) -> typing.Type:
+        mcs: typing.Type["SingleLock"],
+        name: str,
+        bases: typing.Tuple[type, ...],
+        namespace: typing.Dict[str, typing.Any],
+        **kwargs: typing.Any
+    ) -> "SingleLock":
         """Create lock property for class instances."""
         namespace["lock"] = property(fget=lambda self: self.__class__.lock)
         return super().__new__(mcs, name, bases, namespace, **kwargs)  # type: ignore
@@ -71,8 +75,8 @@ def lock(cls) -> threading.RLock:
 
     @classmethod
     def __prepare__(  # pylint: disable=unused-argument
-        mcs: typing.Type["SingleLock"], name: str, bases: typing.Iterable[typing.Type], **kwargs: typing.Any
-    ) -> collections.OrderedDict:
+        mcs: typing.Type["SingleLock"], name: str, bases: typing.Iterable[type], **kwargs: typing.Any
+    ) -> "collections.OrderedDict[str, typing.Any]":
         """Metaclass magic for object storage.
 
         .. versionadded:: 1.2.0

exec_helpers/ssh_auth.py

@@ -113,7 +113,7 @@ def key_filename(self) -> typing.Union[typing.List[str], str, None]:
         """
         return copy.deepcopy(self.__key_filename)
 
-    def enter_password(self, tgt: typing.IO) -> None:
+    def enter_password(self, tgt: typing.BinaryIO) -> None:
         """Enter password to STDIN.
 
         Note: required for 'sudo' call
@@ -122,7 +122,7 @@ def enter_password(self, tgt: typing.IO) -> None:
         :type tgt: file
         """
         # noinspection PyTypeChecker
-        tgt.write("{}\n".format(self.__password))
+        tgt.write("{}\n".format(self.__password if self.__password is not None else "").encode("utf-8"))
 
     def connect(
         self,

exec_helpers/subprocess_runner.py

@@ -141,9 +141,9 @@ def close_streams() -> None:
 
         # pylint: disable=assignment-from-no-return
         # noinspection PyNoneFunctionAssignment
-        stdout_future = poll_stdout()  # type: concurrent.futures.Future
+        stdout_future = poll_stdout()
         # noinspection PyNoneFunctionAssignment
-        stderr_future = poll_stderr()  # type: concurrent.futures.Future
+        stderr_future = poll_stderr()
         # pylint: enable=assignment-from-no-return
 
         try:

test/test_sshauth.py

@@ -103,9 +103,9 @@ def test_001_init_checks(run_parameters) -> None:
     int_keys = get_internal_keys(**run_parameters)
 
     assert auth.username == username
-    with contextlib.closing(io.StringIO()) as tgt:
+    with contextlib.closing(io.BytesIO()) as tgt:
         auth.enter_password(tgt)
-        assert tgt.getvalue() == "{}\n".format(run_parameters.get("password", None))
+        assert tgt.getvalue() == "{}\n".format(run_parameters.get("password", "")).encode("utf-8")
 
     key = run_parameters.get("key", None)
     if key is not None:

tox.ini

@@ -122,7 +122,7 @@ commands = pipdeptree
 
 [testenv:mypy]
 deps =
-    mypy>=0.641
+    mypy>=0.650
     -r{toxinidir}/CI_REQUIREMENTS.txt
 usedevelop = False
 commands = mypy --strict exec_helpers