#9424: add a DeprecationWarning for assertEquals, assertNotEquals, assertAlmostEquals, assertNotAlmostEquals, and assert_
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 640ed4b..91fede0 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1401,6 +1401,8 @@
:mod:`unittest`-based test framework.
+.. _deprecated-aliases:
+
Deprecated aliases
##################
@@ -1408,20 +1410,22 @@
aliases that are now deprecated. The following table lists the correct names
along with their deprecated aliases:
- ============================== ===============================
- Method Name Deprecated alias(es)
- ============================== ===============================
- :meth:`.assertEqual` failUnlessEqual, assertEquals
- :meth:`.assertNotEqual` failIfEqual
- :meth:`.assertTrue` failUnless, assert\_
+ ============================== ====================== ======================
+ Method Name Deprecated alias Deprecated alias
+ ============================== ====================== ======================
+ :meth:`.assertEqual` failUnlessEqual assertEquals
+ :meth:`.assertNotEqual` failIfEqual assertNotEquals
+ :meth:`.assertTrue` failUnless assert\_
:meth:`.assertFalse` failIf
:meth:`.assertRaises` failUnlessRaises
- :meth:`.assertAlmostEqual` failUnlessAlmostEqual
- :meth:`.assertNotAlmostEqual` failIfAlmostEqual
- ============================== ===============================
+ :meth:`.assertAlmostEqual` failUnlessAlmostEqual assertAlmostEquals
+ :meth:`.assertNotAlmostEqual` failIfAlmostEqual assertNotAlmostEquals
+ ============================== ====================== ======================
- .. deprecated:: 3.1
- the aliases listed in the second column
+ .. deprecated-removed:: 3.1 3.3
+ the fail* aliases listed in the second column.
+ .. deprecated:: 3.2
+ the assert* aliases listed in the third column.
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index dd47129..c4b5125 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -506,6 +506,18 @@
with self.assertWarns(DeprecationWarning):
legacy_function('XYZ')
+* The following :class:`unittest.TestCase` methods are now deprecated:
+ * :meth:`assert_` (use :meth:`.assertTrue` instead);
+ * :meth:`assertEquals` (use :meth:`.assertEqual` instead);
+ * :meth:`assertNotEquals` (use :meth:`.assertNotEqual` instead);
+ * :meth:`assertAlmostEquals` (use :meth:`.assertAlmostEqual` instead);
+ * :meth:`assertNotAlmostEquals` (use :meth:`.assertNotAlmostEqual` instead);
+
+ The ``TestCase.fail*`` methods deprecated in Python 3.1 will be removed in
+ Python 3.3. See also the :ref:`deprecated-aliases` section in the
+ :mod:`unittest` documentation.
+
+ (Contributed by Ezio Melotti; :issue:`9424`.)
* The previously deprecated :func:`string.maketrans` function has been removed
in favor of the static methods, :meth:`bytes.maketrans` and