[Python-checkins] cpython (2.7): #18951: use consistent names in unittest docs.
ezio.melotti
python-checkins at python.org
Fri Sep 13 21:20:44 CEST 2013
http://hg.python.org/cpython/rev/6d8ff8c57d38
changeset: 85682:6d8ff8c57d38
branch: 2.7
parent: 85670:a58b620e4dc9
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Sep 13 22:17:40 2013 +0300
summary:
#18951: use consistent names in unittest docs.
files:
Doc/library/unittest.rst | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -916,8 +916,8 @@
| :meth:`assertRaises(exc, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | |
| <TestCase.assertRaises>` | | |
+---------------------------------------------------------+--------------------------------------+------------+
- | :meth:`assertRaisesRegexp(exc, re, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | 2.7 |
- | <TestCase.assertRaisesRegexp>` | and the message matches *re* | |
+ | :meth:`assertRaisesRegexp(exc, r, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | 2.7 |
+ | <TestCase.assertRaisesRegexp>` | and the message matches regex *r* | |
+---------------------------------------------------------+--------------------------------------+------------+
.. method:: assertRaises(exception, callable, *args, **kwds)
@@ -993,10 +993,10 @@
| :meth:`assertLessEqual(a, b) | ``a <= b`` | 2.7 |
| <TestCase.assertLessEqual>` | | |
+---------------------------------------+--------------------------------+--------------+
- | :meth:`assertRegexpMatches(s, re) | ``regex.search(s)`` | 2.7 |
+ | :meth:`assertRegexpMatches(s, r) | ``r.search(s)`` | 2.7 |
| <TestCase.assertRegexpMatches>` | | |
+---------------------------------------+--------------------------------+--------------+
- | :meth:`assertNotRegexpMatches(s, re) | ``not regex.search(s)`` | 2.7 |
+ | :meth:`assertNotRegexpMatches(s, r) | ``not r.search(s)`` | 2.7 |
| <TestCase.assertNotRegexpMatches>` | | |
+---------------------------------------+--------------------------------+--------------+
| :meth:`assertItemsEqual(a, b) | sorted(a) == sorted(b) and | 2.7 |
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list