#11282: merge with 3.2.
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index a4e2cab..a623f3c 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1462,7 +1462,7 @@
: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 4e47707..4d6b8f5 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -1110,8 +1110,7 @@
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
assertEquals = _deprecate(assertEqual)
assertNotEquals = _deprecate(assertNotEqual)
assertAlmostEquals = _deprecate(assertAlmostEqual)
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index 852ac86..bd804c0 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -1093,10 +1093,8 @@
_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.assertNotEquals, (3, 5)),