summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-07-27 20:15:51 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-07-27 20:15:51 (GMT)
commit937b50c378d7025a1242d4867a0376e48239f049 (patch)
tree2553717e29f2a0f79339e4e14f9fefea27938ac7 /Doc/library
parent3223dd5c223d24706eb20fa1a46d6057dbdc826c (diff)
parent9eda66da785cc11dc7e84027990e3108e5aec433 (diff)
downloadcpython-937b50c378d7025a1242d4867a0376e48239f049.zip
cpython-937b50c378d7025a1242d4867a0376e48239f049.tar.gz
cpython-937b50c378d7025a1242d4867a0376e48239f049.tar.bz2
Merge with 3.3
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/unittest.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 9e8a246..a5c4783 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -985,7 +985,7 @@ Test cases
with self.assertWarns(SomeWarning):
do_something()
- When used as a context manager, :meth:`assertRaises` accepts the
+ When used as a context manager, :meth:`assertWarns` accepts the
additional keyword argument *msg*.
The context manager will store the caught warning object in its