#11282: the fail* methods will stay around a few more versions.

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index a3de29b5994761018c753e174e01dfd97240bcce..beed4ded86558f37b4389132feecf1bf339cdc6d 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1459,7 +1459,7 @@ along with their deprecated aliases:
     :meth:`.assertRaisesRegex`                             assertRaisesRegexp
    ==============================  ====================== ======================
 
-   .. deprecated-removed:: 3.1 3.3
+   .. deprecated:: 3.1
          the fail* aliases listed in the second column.
    .. deprecated:: 3.2
          the assert* aliases listed in the third column.

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 65af16bbcaf2f1ff961bca10e8136c79229618ad..01c5a7bc2f4769edde2cae6d633d5c0b55513ed7 100644 (file)
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -1181,8 +1181,7 @@ class TestCase(object):
             return original_func(*args, **kwargs)
         return deprecated_func
 
-    # The fail* methods can be removed in 3.3, the 5 assert* methods will
-    # have to stay around for a few more versions.  See #9424.
+    # see #9424
     failUnlessEqual = assertEquals = _deprecate(assertEqual)
     failIfEqual = assertNotEquals = _deprecate(assertNotEqual)
     failUnlessAlmostEqual = assertAlmostEquals = _deprecate(assertAlmostEqual)

diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index 314aef3ac7f90a700e8baad00c9dcaf3b36eab73..1db433f32c7ab37f35ab8a9754bce20cc4a13976 100644 (file)
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -1088,10 +1088,8 @@ test case
                     _runtime_warn("barz")
 
     def testDeprecatedMethodNames(self):
-        """Test that the deprecated methods raise a DeprecationWarning.
-
-        The fail* methods will be removed in 3.3. The assert* methods will
-        have to stay around for a few more versions.  See #9424.
+        """
+        Test that the deprecated methods raise a DeprecationWarning. See #9424.
         """
         old = (
             (self.failIfEqual, (3, 5)),