summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@gmail.com>2008-12-10 07:28:12 (GMT)
committerJeffrey Yasskin <jyasskin@gmail.com>2008-12-10 07:28:12 (GMT)
commit478a1aa5373be89a6c7464fe1303aa585631acea (patch)
tree011c900524ea6f2d01a6773bcad964d80e6759ac /Lib
parent05e9c9dd970976885ade53a1bf09506d2aeb1c8a (diff)
downloadcpython-478a1aa5373be89a6c7464fe1303aa585631acea.zip
cpython-478a1aa5373be89a6c7464fe1303aa585631acea.tar.gz
cpython-478a1aa5373be89a6c7464fe1303aa585631acea.tar.bz2
Backported issue #4589 to Python 2.5.3: Propagated an exception thrown by a
context manager's __exit__ method's result while it's being converted to bool.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_with.py30
1 files changed, 30 insertions, 0 deletions
diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
index 3ba8977..3004675 100644
--- a/Lib/test/test_with.py
+++ b/Lib/test/test_with.py
@@ -505,6 +505,36 @@ class ExceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):
self.assertRaises(GeneratorExit, shouldThrow)
+ def testErrorsInBool(self):
+ # issue4589: __exit__ return code may raise an exception
+ # when looking at its truth value.
+
+ class cm(object):
+ def __init__(self, bool_conversion):
+ class Bool:
+ def __nonzero__(self):
+ return bool_conversion()
+ self.exit_result = Bool()
+ def __enter__(self):
+ return 3
+ def __exit__(self, a, b, c):
+ return self.exit_result
+
+ def trueAsBool():
+ with cm(lambda: True):
+ self.fail("Should NOT see this")
+ trueAsBool()
+
+ def falseAsBool():
+ with cm(lambda: False):
+ self.fail("Should raise")
+ self.assertRaises(AssertionError, falseAsBool)
+
+ def failAsBool():
+ with cm(lambda: 1//0):
+ self.fail("Should NOT see this")
+ self.assertRaises(ZeroDivisionError, failAsBool)
+
class NonLocalFlowControlTestCase(unittest.TestCase):