From 361467e5226af652fdf08bdfe5737f51eba594e4 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sun, 3 Apr 2011 17:37:58 +0300 Subject: [PATCH] #11282: the fail* methods will stay around a few more versions. --- Doc/library/unittest.rst | 2 +- Lib/unittest/case.py | 3 +-- Lib/unittest/test/test_case.py | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index a3de29b599..beed4ded86 100644 --- 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 65af16bbca..01c5a7bc2f 100644 --- 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 314aef3ac7..1db433f32c 100644 --- 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)), -- 2.40.0