Save information about origin exception and traceback in deserialize (#89)

Bump to 2.1.1

Author: penguinolog

.travis.yml

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

exec_helpers/__init__.py

@@ -49,7 +49,7 @@
     "ExecResult",
 )
 
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 __author__ = "Alexey Stepanov"
 __author_email__ = "penguinolog@gmail.com"
 __maintainers__ = {

exec_helpers/_ssh_client_base.py

@@ -658,7 +658,7 @@ def poll_streams() -> None:
             if stderr and interface.recv_stderr_ready():
                 result.read_stderr(src=stderr, log=self.logger, verbose=verbose)
 
-        @threaded.threadpooled  # type: ignore
+        @threaded.threadpooled
         def poll_pipes(stop: threading.Event) -> None:
             """Polling task for FIFO buffers.
 
@@ -816,7 +816,7 @@ def execute_together(
         .. versionchanged:: 1.2.0 log_mask_re regex rule for masking cmd
         """
 
-        @threaded.threadpooled  # type: ignore
+        @threaded.threadpooled
         def get_result(remote: "SSHClientBase") -> exec_result.ExecResult:
             """Get result from remote call."""
             async_result = remote.execute_async(command, **kwargs)  # type: SshExecuteAsyncResult

exec_helpers/exec_result.py

@@ -365,10 +365,14 @@ def __deserialize(self, fmt: str) -> typing.Any:
                 return json.loads(self.stdout_str, encoding="utf-8")
             elif fmt == "yaml":
                 return yaml.safe_load(self.stdout_str)
-        except Exception:
-            tmpl = " stdout is not valid {fmt}:\n" "{{stdout!r}}\n".format(fmt=fmt)
-            logger.exception(self.cmd + tmpl.format(stdout=self.stdout_str))  # pylint: disable=logging-not-lazy
-            raise exceptions.DeserializeValueError(self.cmd + tmpl.format(stdout=self.stdout_brief))
+        except Exception as e:
+            tmpl = "{{self.cmd}} stdout is not valid {fmt}:\n" "{{stdout!r}}\n".format(fmt=fmt)
+            logger.exception(tmpl.format(self=self, stdout=self.stdout_str))  # pylint: disable=logging-not-lazy
+
+            raise exceptions.DeserializeValueError(tmpl.format(self=self, stdout=self.stdout_brief)).with_traceback(
+                e.__traceback__
+            ) from e
+
         msg = "{fmt} deserialize target is not implemented".format(fmt=fmt)
         logger.error(msg)
         raise NotImplementedError(msg)

exec_helpers/ssh_auth.py

@@ -205,15 +205,13 @@ def __ne__(self, other: typing.Any) -> bool:
 
     def __deepcopy__(self, memo: typing.Any) -> "SSHAuth":
         """Helper for copy.deepcopy."""
-        return self.__class__(  # type: ignore
+        return self.__class__(
             username=self.username, password=self.__password, key=self.__key, keys=copy.deepcopy(self.__keys)
         )
 
     def __copy__(self) -> "SSHAuth":
         """Copy self."""
-        return self.__class__(  # type: ignore
-            username=self.username, password=self.__password, key=self.__key, keys=self.__keys
-        )
+        return self.__class__(username=self.username, password=self.__password, key=self.__key, keys=self.__keys)
 
     def __repr__(self) -> str:
         """Representation for debug purposes."""

exec_helpers/subprocess_runner.py

@@ -145,12 +145,12 @@ def _exec_command(
         .. versionadded:: 1.2.0
         """
 
-        @threaded.threadpooled  # type: ignore
+        @threaded.threadpooled
         def poll_stdout() -> None:
             """Sync stdout poll."""
             result.read_stdout(src=stdout, log=logger, verbose=verbose)
 
-        @threaded.threadpooled  # type: ignore
+        @threaded.threadpooled
         def poll_stderr() -> None:
             """Sync stderr poll."""
             result.read_stderr(src=stderr, log=logger, verbose=verbose)

tox.ini

@@ -147,6 +147,6 @@ commands = pipdeptree
 
 [testenv:mypy]
 deps =
-    mypy>=0.630
+    mypy>=0.641
     -r{toxinidir}/CI_REQUIREMENTS.txt
 commands = mypy --strict exec_helpers