Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#11282: merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-04-03 17:39:19 +03:00
parent c9a5272e8d 361467e522
commit b7af620747
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/unittest.rst
View File

@ -1462,7 +1462,7 @@ along with their deprecated aliases:
: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.

3
Lib/unittest/case.py
View File

@ -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)

6
Lib/unittest/test/test_case.py
View File

@ -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)),