From 1a33b2f35b9195b440b492afa87dcf83ba2ecca4 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Tue, 1 Oct 2013 23:24:56 +1000 Subject: Close #19092: ExitStack now reraises exceptions from __exit__ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Report and patch by Hrvoje Nikšić --- Lib/contextlib.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'Lib/contextlib.py') diff --git a/Lib/contextlib.py b/Lib/contextlib.py index 0b6bf71b08..f8e026b7e2 100644 --- a/Lib/contextlib.py +++ b/Lib/contextlib.py @@ -225,6 +225,8 @@ class ExitStack(object): return self def __exit__(self, *exc_details): + received_exc = exc_details[0] is not None + # We manipulate the exception state so it behaves as though # we were actually nesting multiple with statements frame_exc = sys.exc_info()[1] @@ -239,17 +241,27 @@ class ExitStack(object): # Callbacks are invoked in LIFO order to match the behaviour of # nested context managers suppressed_exc = False + pending_raise = False while self._exit_callbacks: cb = self._exit_callbacks.pop() try: if cb(*exc_details): suppressed_exc = True + pending_raise = False exc_details = (None, None, None) except: new_exc_details = sys.exc_info() # simulate the stack of exceptions by setting the context _fix_exception_context(new_exc_details[1], exc_details[1]) - if not self._exit_callbacks: - raise + pending_raise = True exc_details = new_exc_details - return suppressed_exc + if pending_raise: + try: + # bare "raise exc_details[1]" replaces our carefully + # set-up context + fixed_ctx = exc_details[1].__context__ + raise exc_details[1] + except BaseException: + exc_details[1].__context__ = fixed_ctx + raise + return received_exc and suppressed_exc -- cgit v1.2.1