core: use six.reraise for py2/py3 compatibility

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/teuthology/contextutil.py b/teuthology/contextutil.py
index cdd9049534a082abb385a3c049cd883b7b9a38fb..7951478782d8e34effe06bdad0b23b6fc2dd0a4f 100644 (file)
--- a/teuthology/contextutil.py
+++ b/teuthology/contextutil.py
@@ -7,6 +7,8 @@ import itertools
 from teuthology.config import config
 from teuthology.exceptions import MaxWhileTries
 
+from six import reraise
+
 log = logging.getLogger(__name__)
 
 @contextlib.contextmanager
@@ -51,7 +53,7 @@ def nested(*managers):
             # Don't rely on sys.exc_info() still containing
             # the right information. Another exception may
             # have been raised and caught by an exit method
-            raise exc[0], exc[1], exc[2]
+            reraise(*exc)
 
 
 class safe_while(object):

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 037755e5eb560835232174f67fb53d06b76b3aa3..e253d4903ad8a45bc11c55e6a91e7b2883a8570a 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -2,7 +2,6 @@
 Miscellaneous teuthology functions.
 Used by other modules, but mostly called from tasks.
 """
-
 import argparse
 import os
 import logging
@@ -30,6 +29,8 @@ from teuthology.config import config
 from teuthology.contextutil import safe_while
 from teuthology.orchestra.opsys import DEFAULT_OS_VERSION
 
+from six import reraise
+
 log = logging.getLogger(__name__)
 
 import datetime
@@ -1208,7 +1209,7 @@ def stop_daemons_of_type(ctx, type_, cluster='ceph'):
             exc_info = sys.exc_info()
             log.exception('Saw exception from %s.%s', daemon.role, daemon.id_)
     if exc_info != (None, None, None):
-        raise exc_info[0], exc_info[1], exc_info[2]
+        reraise(*exc_info)
 
 
 def get_system_type(remote, distro=False, version=False):

diff --git a/teuthology/parallel.py b/teuthology/parallel.py
index 265dfcbdff16beb7cf996c4e24ec1697d0deb39c..40e9139b92a7ad8fd482b7d7a36c16e456b66ef4 100644 (file)
--- a/teuthology/parallel.py
+++ b/teuthology/parallel.py
@@ -5,6 +5,8 @@ import gevent
 import gevent.pool
 import gevent.queue
 
+from six import reraise
+
 log = logging.getLogger(__name__)
 
 
@@ -32,7 +34,7 @@ def resurrect_traceback(exc):
     else:
         return
 
-    raise exc_info[0], exc_info[1], exc_info[2]
+    reraise(*exc_info)
 
 
 class parallel(object):