[Python-checkins] cpython (3.2): #11282: the fail* methods will stay around a few more versions.

Sun Apr 3 17:03:32 CEST 2011

http://hg.python.org/cpython/rev/1fd736395df3
changeset: 69109:1fd736395df3
branch: 3.2
parent: 69107:5fd1ac1c9474
user: Ezio Melotti
date: Sun Apr 03 17:37:58 2011 +0300
summary:
 #11282: the fail* methods will stay around a few more versions.
files:
 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
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1459,7 +1459,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
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -1181,8 +1181,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
 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
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -1088,10 +1088,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.failIfEqual, (3, 5)),
-- 
Repository URL: http://hg.python.org/cpython
