commit 3814a911aa6953a5aefbe8150d280d3a20747d6d
author Nick Coghlan <ncoghlan@gmail.com> Fri Nov 02 10:09:12 2007 +0000
committer Nick Coghlan <ncoghlan@gmail.com> Fri Nov 02 10:09:12 2007 +0000
tree f61fd04a3978608907ac3390a057537ca0da51fd
parent ac3d429edc5d1488c00c443d860f3e00f6bdd49e

Fix for bug 1705170 - contextmanager swallowing StopIteration (2.5 backport candidate)

Lib/contextlib.py

diff --git a/Lib/contextlib.py b/Lib/contextlib.py
index 4f83ef6..dbd1c57 100644
--- a/Lib/contextlib.py
+++ b/Lib/contextlib.py
@@ -25,6 +25,10 @@
             else:
                 raise RuntimeError("generator didn't stop")
         else:
+            if value is None:
+                # Need to force instantiation so we can reliably
+                # tell if we get the same exception back
+                value = type()
             try:
                 self.gen.throw(type, value, traceback)
                 raise RuntimeError("generator didn't stop after throw()")