summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorEzio Melotti <none@none>2011-04-03 14:37:58 (GMT)
committerEzio Melotti <none@none>2011-04-03 14:37:58 (GMT)
commit361467e5226af652fdf08bdfe5737f51eba594e4 (patch)
treefb5026cafae3b893dff3556e86586d837d1871f1 /Lib/unittest
parent9481e4174191e43fbb2bff4c670bb6c604e86ae2 (diff)
downloadcpython-361467e5226af652fdf08bdfe5737f51eba594e4.zip
cpython-361467e5226af652fdf08bdfe5737f51eba594e4.tar.gz
cpython-361467e5226af652fdf08bdfe5737f51eba594e4.tar.bz2
#11282: the fail* methods will stay around a few more versions.
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/case.py3
-rw-r--r--Lib/unittest/test/test_case.py6
2 files changed, 3 insertions, 6 deletions
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 65af16b..01c5a7b 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 314aef3..1db433f 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)),