(original) (raw)
changeset: 85682:6d8ff8c57d38 branch: 2.7 parent: 85670:a58b620e4dc9 user: Ezio Melotti ezio.melotti@gmail.com date: Fri Sep 13 22:17:40 2013 +0300 files: Doc/library/unittest.rst description: #18951: use consistent names in unittest docs. diff -r a58b620e4dc9 -r 6d8ff8c57d38 Doc/library/unittest.rst --- a/Doc/library/unittest.rst Fri Sep 13 00🔞55 2013 -0700 +++ b/Doc/library/unittest.rst Fri Sep 13 22:17:40 2013 +0300 @@ -916,8 +916,8 @@ | :meth:`assertRaises(exc, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | | | ` | | | +---------------------------------------------------------+--------------------------------------+------------+ - | :meth:`assertRaisesRegexp(exc, re, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | 2.7 | - | ` | and the message matches *re* | | + | :meth:`assertRaisesRegexp(exc, r, fun, *args, **kwds) | ``fun(*args, **kwds)`` raises *exc* | 2.7 | + | ` | and the message matches regex *r* | | +---------------------------------------------------------+--------------------------------------+------------+ .. method:: assertRaises(exception, callable, *args, **kwds) @@ -993,10 +993,10 @@ | :meth:`assertLessEqual(a, b) | ``a <= b`` | 2.7 | | ` | | | +---------------------------------------+--------------------------------+--------------+ - | :meth:`assertRegexpMatches(s, re) | ``regex.search(s)`` | 2.7 | + | :meth:`assertRegexpMatches(s, r) | ``r.search(s)`` | 2.7 | | ` | | | +---------------------------------------+--------------------------------+--------------+ - | :meth:`assertNotRegexpMatches(s, re) | ``not regex.search(s)`` | 2.7 | + | :meth:`assertNotRegexpMatches(s, r) | ``not r.search(s)`` | 2.7 | | ` | | | +---------------------------------------+--------------------------------+--------------+ | :meth:`assertItemsEqual(a, b) | sorted(a) == sorted(b) and | 2.7 |/ezio.melotti@gmail.com