summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-10-04 20:07:34 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-10-04 20:07:34 (GMT)
commit9a779ea98ec7c0edff9fa9ff4a60b1fcc589a2b9 (patch)
tree967a76946006629b4b16689bbd6cb0f98f2b6bf8 /Lib/unittest
parent2e30440153dbd7864fa2201a43a48ebfec66b14b (diff)
downloadcpython-9a779ea98ec7c0edff9fa9ff4a60b1fcc589a2b9.zip
cpython-9a779ea98ec7c0edff9fa9ff4a60b1fcc589a2b9.tar.gz
cpython-9a779ea98ec7c0edff9fa9ff4a60b1fcc589a2b9.tar.bz2
Merged revisions 74524,74556 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74524 | gregory.p.smith | 2009-08-20 04:39:38 -0500 (Thu, 20 Aug 2009) | 2 lines Add weakref support to the thread.lock type. ........ r74556 | kristjan.jonsson | 2009-08-27 17:20:21 -0500 (Thu, 27 Aug 2009) | 2 lines issue 6275 Add an "exc_value" attribute to the _AssertRaisesContext context manager in the unittest package. This allows further tests on the exception that was raised after the context manager exits. ........
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/case.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 77ca278..660ddeb 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -116,6 +116,7 @@ class _AssertRaisesContext(object):
if not issubclass(exc_type, self.expected):
# let unexpected exceptions pass through
return False
+ self.exc_value = exc_value #store for later retrieval
if self.expected_regex is None:
return True