Rolled back revisions 74556 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk
This commit is contained in:
Benjamin Peterson 2009-10-10 21:27:03 +00:00
parent 38c34ef5de
commit 676161a850
3 changed files with 0 additions and 20 deletions

View File

@ -891,10 +891,6 @@ Test cases
with self.failUnlessRaises(some_error_class):
do_something()
The context manager will store the caught exception object in its
:attr:`exc_value` attribute. This can be useful if the intention
is to perform additional checks on the exception raised.
.. versionchanged:: 3.1
Added the ability to use :meth:`assertRaises` as a context manager.

View File

@ -2846,21 +2846,6 @@ test case
self.assertRaisesRegexp, Exception,
re.compile('^Expected$'), Stub)
def testAssertRaisesExcValue(self):
class ExceptionMock(Exception):
pass
def Stub(foo):
raise ExceptionMock(foo)
v = "particular value"
ctx = self.assertRaises(ExceptionMock)
with ctx:
Stub(v)
e = ctx.exc_value
self.assertTrue(isinstance(e, ExceptionMock))
self.assertEqual(e.args[0], v)
def testSynonymAssertMethodNames(self):
"""Test undocumented method name synonyms.

View File

@ -116,7 +116,6 @@ 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