summaryrefslogtreecommitdiff
path: root/Lib/unittest/test/test_case.py
diff options
context:
space:
mode:
authorEzio Melotti <none@none>2011-04-03 17:39:19 +0300
committerEzio Melotti <none@none>2011-04-03 17:39:19 +0300
commitb7af620747a542c8173fc9d2fef59e1141e9ff20 (patch)
tree304809a7381969596398c6389d1ba6fa6a384d2b /Lib/unittest/test/test_case.py
parentc9a5272e8dc0aaa5d0ce63297b72292f4982db18 (diff)
parent361467e5226af652fdf08bdfe5737f51eba594e4 (diff)
downloadcpython-git-b7af620747a542c8173fc9d2fef59e1141e9ff20.tar.gz
#11282: merge with 3.2.
Diffstat (limited to 'Lib/unittest/test/test_case.py')
-rw-r--r--Lib/unittest/test/test_case.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index 852ac86f0d..bd804c0056 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -1093,10 +1093,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.assertNotEquals, (3, 5)),