Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge with 3.3

This commit is contained in:
Terry Jan Reedy 2013-07-30 22:31:30 -04:00
parent 4efdb4177e 778cba7f29
commit 92e2a220ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/unittest.rst
View File

@ -974,12 +974,12 @@ Test cases
Test that a warning is triggered when *callable* is called with any
positional or keyword arguments that are also passed to
:meth:`assertWarns`. The test passes if *warning* is triggered and
fails if it isn't. Also, any unexpected exception is an error.
fails if it isn't. Any exception is an error.
To catch any of a group of warnings, a tuple containing the warning
classes may be passed as *warnings*.
If only the *warning* and possibly the *msg* arguments are given,
returns a context manager so that the code under test can be written
return a context manager so that the code under test can be written
inline rather than as a function::
with self.assertWarns(SomeWarning):
@ -992,7 +992,7 @@ Test cases
:attr:`warning` attribute, and the source line which triggered the
warnings in the :attr:`filename` and :attr:`lineno` attributes.
This can be useful if the intention is to perform additional checks
on the exception raised::
on the warning caught::
with self.assertWarns(SomeWarning) as cm:
do_something()