[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3
terry.reedy
python-checkins at python.org
Wed Jul 31 04:31:49 CEST 2013
http://hg.python.org/cpython/rev/acfb863b0937
changeset: 84927:acfb863b0937
parent: 84925:5cea8bc7bc7f
parent: 84926:366beee880aa
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Tue Jul 30 22:31:30 2013 -0400
summary:
Merge with 3.3
files:
Doc/library/unittest.rst | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -974,12 +974,12 @@
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 @@
: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()
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list