Fix SF#1462485: StopIteration raised in body of 'with' statement suppressed
diff --git a/Lib/contextlib.py b/Lib/contextlib.py
index 9c00ef0..c26e27e 100644
--- a/Lib/contextlib.py
+++ b/Lib/contextlib.py
@@ -32,7 +32,9 @@
self.gen.throw(type, value, traceback)
raise RuntimeError("generator didn't stop after throw()")
except StopIteration:
- return True
+ # Supress the exception unless it's the same exception the
+ # was passed to throw().
+ return sys.exc_info()[1] is not value
except:
# only re-raise if it's *not* the exception that was
# passed to throw(), because __exit__() must not raise
diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
index 4854436..48e00f4 100644
--- a/Lib/test/test_with.py
+++ b/Lib/test/test_with.py
@@ -494,6 +494,62 @@
self.assertAfterWithGeneratorInvariantsWithError(self.foo)
self.assertAfterWithGeneratorInvariantsNoError(self.bar)
+ def testRaisedStopIteration1(self):
+ @contextmanager
+ def cm():
+ yield
+
+ def shouldThrow():
+ with cm():
+ raise StopIteration("from with")
+
+ self.assertRaises(StopIteration, shouldThrow)
+
+ def testRaisedStopIteration2(self):
+ class cm (object):
+ def __context__(self):
+ return self
+
+ def __enter__(self):
+ pass
+
+ def __exit__(self, type, value, traceback):
+ pass
+
+ def shouldThrow():
+ with cm():
+ raise StopIteration("from with")
+
+ self.assertRaises(StopIteration, shouldThrow)
+
+ def testRaisedGeneratorExit1(self):
+ @contextmanager
+ def cm():
+ yield
+
+ def shouldThrow():
+ with cm():
+ raise GeneratorExit("from with")
+
+ self.assertRaises(GeneratorExit, shouldThrow)
+
+ def testRaisedGeneratorExit2(self):
+ class cm (object):
+ def __context__(self):
+ return self
+
+ def __enter__(self):
+ pass
+
+ def __exit__(self, type, value, traceback):
+ pass
+
+ def shouldThrow():
+ with cm():
+ raise GeneratorExit("from with")
+
+ self.assertRaises(GeneratorExit, shouldThrow)
+
class NonLocalFlowControlTestCase(unittest.TestCase):