summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-09-13 19:17:40 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-09-13 19:17:40 (GMT)
commit560a77881b8e50ddc272d4c8e680771cdf03160c (patch)
tree4afa9207d6c12246d22a08a42df0b30fa9ab9f64
parent61f4cd1dd534b33346a1290a1fe0ad3e71205e94 (diff)
downloadcpython-560a77881b8e50ddc272d4c8e680771cdf03160c.zip
cpython-560a77881b8e50ddc272d4c8e680771cdf03160c.tar.gz
cpython-560a77881b8e50ddc272d4c8e680771cdf03160c.tar.bz2
#18951: use consistent names in unittest docs.
-rw-r--r--Doc/library/unittest.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 4c39b82..5157b26 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -815,14 +815,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)
@@ -978,10 +978,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 |