[3.6] Clarify exception handler scope in contextlib (GH-1103)

Mariatta · web-flow · commit bd1173f202f5 · 2017-04-12T20:52:39.000-07:00
Moved explicit raise from inside try to try...else. (cherry picked from commit 680e20b)
diff --git a/Lib/contextlib.py b/Lib/contextlib.py
@@ -98,7 +98,6 @@ def __exit__(self, type, value, traceback):
                 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 @@ def __exit__(self, type, value, traceback):
                 #
                 if sys.exc_info()[1] is not value:
                     raise
+            else:
+                raise RuntimeError("generator didn't stop after throw()")
 
 
 def contextmanager(func):
