mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 78091,78094,78109 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78091 | georg.brandl | 2010-02-07 19:02:22 +0200 (Sun, 07 Feb 2010) | 1 line

  Rename "exc_value" attribute on assertRaises context manager to "exception".
........
  r78094 | michael.foord | 2010-02-07 20:44:12 +0200 (Sun, 07 Feb 2010) | 1 line

  assertRaises as context manager now allows you to access exception as documented
........
  r78109 | ezio.melotti | 2010-02-08 23:52:08 +0200 (Mon, 08 Feb 2010) | 1 line

  Fix exc_value -> exception in docstring
........
This commit is contained in:
Ezio Melotti 2010-02-08 21:57:48 +00:00
parent 7b26d7f82f
commit 4900823027
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/unittest/case.py
View file

@ -99,7 +99,7 @@ class _AssertRaisesContext(object):
self.expected_regex = expected_regexp
def __enter__(self):
pass
return self
def __exit__(self, exc_type, exc_value, tb):
if exc_type is None:
@ -116,8 +116,8 @@ class _AssertRaisesContext(object):
if not issubclass(exc_type, self.expected):
# let unexpected exceptions pass through
return False
#store exception, without traceback, for later retrieval
self.exc_value = exc_value.with_traceback(None)
# store exception, without traceback, for later retrieval
self.exception = exc_value.with_traceback(None)
if self.expected_regex is None:
return True
@ -397,12 +397,12 @@ class TestCase(object):
do_something()
The context manager keeps a reference to the exception as
the exc_value attribute. This allows you to inspect the
the 'exception' attribute. This allows you to inspect the
exception after the assertion::
with self.assertRaises(SomeException) as cm:
do_something()
the_exception = cm.exc_value
the_exception = cm.exception
self.assertEqual(the_exception.error_code, 3)
"""
context = _AssertRaisesContext(excClass, self, callableObj)