diff options
| author | Ezio Melotti <none@none> | 2011-04-03 14:39:19 (GMT) |
|---|---|---|
| committer | Ezio Melotti <none@none> | 2011-04-03 14:39:19 (GMT) |
| commit | b7af620747a542c8173fc9d2fef59e1141e9ff20 (patch) | |
| tree | 304809a7381969596398c6389d1ba6fa6a384d2b /Lib/unittest | |
| parent | c9a5272e8dc0aaa5d0ce63297b72292f4982db18 (diff) | |
| parent | 361467e5226af652fdf08bdfe5737f51eba594e4 (diff) | |
| download | cpython-b7af620747a542c8173fc9d2fef59e1141e9ff20.zip cpython-b7af620747a542c8173fc9d2fef59e1141e9ff20.tar.gz cpython-b7af620747a542c8173fc9d2fef59e1141e9ff20.tar.bz2 | |
#11282: merge with 3.2.
Diffstat (limited to 'Lib/unittest')
| -rw-r--r-- | Lib/unittest/case.py | 3 | ||||
| -rw-r--r-- | Lib/unittest/test/test_case.py | 6 |
2 files changed, 3 insertions, 6 deletions
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 @@ 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 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 @@ 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)), |