diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-09-13 19:18:02 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-09-13 19:18:02 (GMT) |
| commit | 92ed89081e8fd7dce4fa4815bfb68d7a8d223bc8 (patch) | |
| tree | 691271ba1f142c92578970a17d448f9df733ad98 | |
| parent | 0cc86850b69c23ab834ae2c97c5dc8b717420a38 (diff) | |
| parent | 560a77881b8e50ddc272d4c8e680771cdf03160c (diff) | |
| download | cpython-92ed89081e8fd7dce4fa4815bfb68d7a8d223bc8.zip cpython-92ed89081e8fd7dce4fa4815bfb68d7a8d223bc8.tar.gz cpython-92ed89081e8fd7dce4fa4815bfb68d7a8d223bc8.tar.bz2 | |
#18951: merge with 3.3.
| -rw-r--r-- | Doc/library/unittest.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 9071227..7a72e0b 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -892,14 +892,14 @@ Test cases | :meth:`assertRaises(exc, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | | | <TestCase.assertRaises>` | | | +---------------------------------------------------------+--------------------------------------+------------+ - | :meth:`assertRaisesRegex(exc, re, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | 3.1 | - | <TestCase.assertRaisesRegex>` | and the message matches *re* | | + | :meth:`assertRaisesRegex(exc, r, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | 3.1 | + | <TestCase.assertRaisesRegex>` | and the message matches regex *r* | | +---------------------------------------------------------+--------------------------------------+------------+ | :meth:`assertWarns(warn, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *warn* | 3.2 | | <TestCase.assertWarns>` | | | +---------------------------------------------------------+--------------------------------------+------------+ - | :meth:`assertWarnsRegex(warn, re, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *warn* | 3.2 | - | <TestCase.assertWarnsRegex>` | and the message matches *re* | | + | :meth:`assertWarnsRegex(warn, r, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *warn* | 3.2 | + | <TestCase.assertWarnsRegex>` | and the message matches regex *r* | | +---------------------------------------------------------+--------------------------------------+------------+ .. method:: assertRaises(exception, callable, *args, **kwds) @@ -1055,10 +1055,10 @@ Test cases | :meth:`assertLessEqual(a, b) | ``a <= b`` | 3.1 | | <TestCase.assertLessEqual>` | | | +---------------------------------------+--------------------------------+--------------+ - | :meth:`assertRegex(s, re) | ``regex.search(s)`` | 3.1 | + | :meth:`assertRegex(s, r) | ``r.search(s)`` | 3.1 | | <TestCase.assertRegex>` | | | +---------------------------------------+--------------------------------+--------------+ - | :meth:`assertNotRegex(s, re) | ``not regex.search(s)`` | 3.2 | + | :meth:`assertNotRegex(s, r) | ``not r.search(s)`` | 3.2 | | <TestCase.assertNotRegex>` | | | +---------------------------------------+--------------------------------+--------------+ | :meth:`assertCountEqual(a, b) | *a* and *b* have the same | 3.2 | |