teuthology: drop six.reraise()

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/teuthology/contextutil.py b/teuthology/contextutil.py
index 7951478782d8e34effe06bdad0b23b6fc2dd0a4f..57a0f08c86b6dbc969350aca850f188d2ef0f8a2 100644 (file)
--- a/teuthology/contextutil.py
+++ b/teuthology/contextutil.py
@@ -7,7 +7,6 @@ import itertools
 from teuthology.config import config
 from teuthology.exceptions import MaxWhileTries
 
-from six import reraise
 
 log = logging.getLogger(__name__)
 
@@ -53,7 +52,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
-            reraise(*exc)
+            raise exc[1]
 
 
 class safe_while(object):

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 08264ba98d83d0c30eeed5d24887650e6c939643..3257688904626366ae5e96ec20b6d3fe83c89d62 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -9,7 +9,6 @@ import configobj
 import getpass
 import socket
 import subprocess
-import sys
 import tarfile
 import time
 import yaml
@@ -29,7 +28,8 @@ from teuthology.config import config
 from teuthology.contextutil import safe_while
 from teuthology.orchestra.opsys import DEFAULT_OS_VERSION
 
-from six import (reraise, ensure_str)
+from six import ensure_str
+
 
 log = logging.getLogger(__name__)
 
@@ -1179,17 +1179,17 @@ def stop_daemons_of_type(ctx, type_, cluster='ceph'):
     :param type_: type of daemons to be stopped.
     """
     log.info('Shutting down %s daemons...' % type_)
-    exc_info = (None, None, None)
+    exc = None
     for daemon in ctx.daemons.iter_daemons_of_role(type_, cluster):
         try:
             daemon.stop()
         except (CommandFailedError,
                 CommandCrashedError,
-                ConnectionLostError):
-            exc_info = sys.exc_info()
+                ConnectionLostError) as e:
+            exc = e
             log.exception('Saw exception from %s.%s', daemon.role, daemon.id_)
-    if exc_info != (None, None, None):
-        reraise(*exc_info)
+    if exc is not None:
+        raise exc
 
 
 def get_system_type(remote, distro=False, version=False):

diff --git a/teuthology/parallel.py b/teuthology/parallel.py
index a1cbb8df2e23bd3962a8b16c3cdd3ec6e0efc77c..0a7d3ab35a008ab1339a89c03cb8ecd81200dd7e 100644 (file)
--- a/teuthology/parallel.py
+++ b/teuthology/parallel.py
@@ -5,7 +5,6 @@ import gevent
 import gevent.pool
 import gevent.queue
 
-from six import reraise
 
 log = logging.getLogger(__name__)
 
@@ -28,14 +27,12 @@ def capture_traceback(func, *args, **kwargs):
 
 def resurrect_traceback(exc):
     if isinstance(exc, ExceptionHolder):
-        exc_info = exc.exc_info
+        raise exc.exc_info[1]
     elif isinstance(exc, BaseException):
-        exc_info = (type(exc), exc, None)
+        raise exc
     else:
         return
 
-    reraise(*exc_info)
-
 
 class parallel(object):
     """