summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-06 10:08:21 (GMT)
committerGeorg Brandl <georg@python.org>2010-02-06 10:08:21 (GMT)
commit1c7c7304a3ea74e3d1fa187b62dd99d2361bd603 (patch)
tree6d9d6ae418586e71c9d2f263b97f99a95b43d81f
parentce6e4b0930f3beaff0d2d11f7473d295d87866c5 (diff)
downloadcpython-1c7c7304a3ea74e3d1fa187b62dd99d2361bd603.zip
cpython-1c7c7304a3ea74e3d1fa187b62dd99d2361bd603.tar.gz
cpython-1c7c7304a3ea74e3d1fa187b62dd99d2361bd603.tar.bz2
#7864: make deprecation notices a bit clearer.
-rw-r--r--Doc/library/unittest.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index fccd6ef..0115ffa 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -681,7 +681,7 @@ Test cases
will be *msg* if given, otherwise it will be :const:`None`.
.. deprecated:: 2.7
- :meth:`failUnless`.
+ :meth:`failUnless`; use one of the ``assert`` variants.
.. method:: assertEqual(first, second[, msg])
@@ -703,7 +703,7 @@ Test cases
Added the automatic calling of type specific equality function.
.. deprecated:: 2.7
- :meth:`failUnlessEqual`.
+ :meth:`failUnlessEqual`; use :meth:`assertEqual`.
.. method:: assertNotEqual(first, second[, msg])
@@ -717,7 +717,7 @@ Test cases
*first* and *second*.
.. deprecated:: 2.7
- :meth:`failIfEqual`.
+ :meth:`failIfEqual`; use :meth:`assertNotEqual`.
.. method:: assertAlmostEqual(first, second[, places[, msg]])
@@ -736,7 +736,7 @@ Test cases
Objects that compare equal are automatically almost equal.
.. deprecated:: 2.7
- :meth:`failUnlessAlmostEqual`.
+ :meth:`failUnlessAlmostEqual`; use :meth:`assertAlmostEqual`.
.. method:: assertNotAlmostEqual(first, second[, places[, msg]])
@@ -755,7 +755,7 @@ Test cases
Objects that compare equal automatically fail.
.. deprecated:: 2.7
- :meth:`failIfAlmostEqual`.
+ :meth:`failIfAlmostEqual`; use :meth:`assertNotAlmostEqual`.
.. method:: assertGreater(first, second, msg=None)
@@ -911,7 +911,7 @@ Test cases
Added the ability to use :meth:`assertRaises` as a context manager.
.. deprecated:: 2.7
- :meth:`failUnlessRaises`.
+ :meth:`failUnlessRaises`; use :meth:`assertRaises`.
.. method:: assertRaisesRegexp(exception, regexp[, callable, ...])
@@ -988,7 +988,7 @@ Test cases
for the error message.
.. deprecated:: 2.7
- :meth:`failIf`.
+ :meth:`failIf`; use :meth:`assertFalse`.
.. method:: fail([msg])