From 680e20beee8bbce9f857b8e7795009191f98b0ba Mon Sep 17 00:00:00 2001 From: amosonn Date: Wed, 1 Mar 2017 07:18:27 +0100 Subject: [PATCH] Clarify exception handler scope in contextlib Moved explicit raise from inside try to try...else. --- Lib/contextlib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/contextlib.py b/Lib/contextlib.py index 84219685259..e91cf460e53 100644 --- a/Lib/contextlib.py +++ b/Lib/contextlib.py @@ -98,7 +98,6 @@ class _GeneratorContextManager(ContextDecorator, AbstractContextManager): value = type() try: self.gen.throw(type, value, traceback) - raise RuntimeError("generator didn't stop after throw()") except StopIteration as exc: # Suppress StopIteration *unless* it's the same exception that # was passed to throw(). This prevents a StopIteration @@ -124,6 +123,8 @@ class _GeneratorContextManager(ContextDecorator, AbstractContextManager): # if sys.exc_info()[1] is not value: raise + else: + raise RuntimeError("generator didn't stop after throw()") def contextmanager(func):