Mercurial > cpython-lru_cache-weakref
changeset 69110:110bb604bc2f
#11282: merge with 3.2.
| author | Ezio Melotti |
|---|---|
| date | Sun, 03 Apr 2011 17:39:19 +0300 |
| parents | ca5932a51a9b (current diff) 1fd736395df3 (diff) |
| children | aa658836e090 |
| files | Doc/library/unittest.rst Lib/unittest/case.py Lib/unittest/test/test_case.py |
| diffstat | 3 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Doc/library/unittest.rst Sun Apr 03 16:25:49 2011 +0300 +++ b/Doc/library/unittest.rst Sun Apr 03 17:39:19 2011 +0300 @@ -1462,7 +1462,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.
--- a/Lib/unittest/case.py Sun Apr 03 16:25:49 2011 +0300 +++ b/Lib/unittest/case.py Sun Apr 03 17:39:19 2011 +0300 @@ -1110,8 +1110,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 assertEquals = _deprecate(assertEqual) assertNotEquals = _deprecate(assertNotEqual) assertAlmostEquals = _deprecate(assertAlmostEqual)
--- a/Lib/unittest/test/test_case.py Sun Apr 03 16:25:49 2011 +0300 +++ b/Lib/unittest/test/test_case.py Sun Apr 03 17:39:19 2011 +0300 @@ -1093,10 +1093,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.assertNotEquals, (3, 5)),