summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-03 20:51:17 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-03 20:51:17 (GMT)
commit327433f864ee0a010997b77fc455d75aba79bd1f (patch)
treeb749f2fb145590d718ae56bfbd5ab83c3b50c630 /Doc
parent9c02c2ffa2dc4b639889e2eef60a68bad96f54d4 (diff)
downloadcpython-327433f864ee0a010997b77fc455d75aba79bd1f.zip
cpython-327433f864ee0a010997b77fc455d75aba79bd1f.tar.gz
cpython-327433f864ee0a010997b77fc455d75aba79bd1f.tar.bz2
Divide the context manager signature from the normal one for consistency with the other methods.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/unittest.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 49260e0..9839efb 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -989,7 +989,8 @@ Test cases
:meth:`failUnlessRaises`; use :meth:`assertRaises`.
- .. method:: assertRaisesRegexp(exception, regexp[, callable, ...])
+ .. method:: assertRaisesRegexp(exception, regexp, callable, *args, **kwds)
+ assertRaisesRegexp(exception, regexp)
Like :meth:`assertRaises` but also tests that *regexp* matches
on the string representation of the raised exception. *regexp* may be
@@ -1041,7 +1042,8 @@ Test cases
.. versionadded:: 3.2
- .. method:: assertWarnsRegexp(warning, regexp[, callable, ...])
+ .. method:: assertWarnsRegexp(warning, regexp, callable, *args, **kwds)
+ assertWarnsRegexp(warning, regexp)
Like :meth:`assertWarns` but also tests that *regexp* matches on the
message of the triggered warning. *regexp* may be a regular expression