diff options
| -rw-r--r-- | ipapython/install/core.py | 4 | ||||
| -rw-r--r-- | ipapython/install/util.py | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/ipapython/install/core.py b/ipapython/install/core.py index 92ad12c7f..f4b2806ea 100644 --- a/ipapython/install/core.py +++ b/ipapython/install/core.py @@ -10,6 +10,8 @@ import sys import abc import itertools +import six + from ipapython.ipa_log_manager import root_logger from . import util @@ -361,7 +363,7 @@ class Configurable(object): def _handle_exception(self, exc_info): assert not hasattr(super(Configurable, self), '_handle_exception') - util.raise_exc_info(exc_info) + six.reraise(*exc_info) def __transition(self, from_state, to_state): if self.__state != from_state: diff --git a/ipapython/install/util.py b/ipapython/install/util.py index 12530d45a..d86db218b 100644 --- a/ipapython/install/util.py +++ b/ipapython/install/util.py @@ -11,14 +11,6 @@ import sys import six -def raise_exc_info(exc_info): - """ - Raise exception from exception info tuple as returned by `sys.exc_info()`. - """ - - raise exc_info[0], exc_info[1], exc_info[2] - - class from_(object): """ Wrapper for delegating to a subgenerator. @@ -86,7 +78,7 @@ def run_generator_with_yield_from(gen): exc_info = sys.exc_info() if exc_info is not None: - raise_exc_info(exc_info) + six.reraise(*exc_info) class InnerClassMeta(type): |