PapiExecutor always verifies

[csit.git] / resources / libraries / python / ssh.py

diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py
index e4ac93f..cee3586 100644 (file)
--- a/resources/libraries/python/ssh.py
+++ b/resources/libraries/python/ssh.py
@@ -24,31 +24,13 @@ from robot.api import logger
 from scp import SCPClient, SCPException
 
 from resources.libraries.python.OptionString import OptionString
 from scp import SCPClient, SCPException
 
 from resources.libraries.python.OptionString import OptionString

+from resources.libraries.python.PythonThree import raise_from

 
 __all__ = ["exec_cmd", "exec_cmd_no_error"]
 
 # TODO: load priv key
 
 
 
 __all__ = ["exec_cmd", "exec_cmd_no_error"]
 
 # TODO: load priv key
 
 

-def raise_from(raising, excepted):
-    """Function to be replaced by "raise from" in Python 3.
-
-    Neither "six" nor "future" offer good enough implementation right now.
-    chezsoi.org/lucas/blog/displaying-chained-exceptions-stacktraces-in-python-2
-
-    Current implementation just logs excepted error, and raises the new one.
-
-    :param raising: The exception to raise.
-    :param excepted: The exception we excepted and want to log.
-    :type raising: BaseException
-    :type excepted: BaseException
-    :raises: raising
-    """
-    logger.error("Excepted: {exc!r}\nRaising: {rai!r}".format(
-        exc=excepted, rai=raising))
-    raise raising
-
-

 class SSHTimeout(Exception):
     """This exception is raised when a timeout occurs."""
     pass
 class SSHTimeout(Exception):
     """This exception is raised when a timeout occurs."""
     pass