From: amosonn <amosonn@gmail.com>
Date: Wed, 1 Mar 2017 06:18:27 +0000 (+0100)
Subject: Clarify exception handler scope in contextlib
X-Git-Tag: v3.7.0a1~1253
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=680e20beee8bbce9f857b8e7795009191f98b0ba;p=thirdparty%2FPython%2Fcpython.git

Clarify exception handler scope in contextlib

Moved explicit raise from inside try to try...else.
---

diff --git a/Lib/contextlib.py b/Lib/contextlib.py
index 842196852594..e91cf460e53b 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):