mirror of https://github.com/python/cpython
Merged revisions 78131 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78131 | michael.foord | 2010-02-10 14:31:30 +0000 (Wed, 10 Feb 2010) | 1 line Remove deprecation on assert_. It is used too frequently. ........
This commit is contained in:
parent
34c9462d71
commit
0e31b992fa
|
@ -498,6 +498,7 @@ class TestCase(object):
|
||||||
assertNotEquals = assertNotEqual
|
assertNotEquals = assertNotEqual
|
||||||
assertAlmostEquals = assertAlmostEqual
|
assertAlmostEquals = assertAlmostEqual
|
||||||
assertNotAlmostEquals = assertNotAlmostEqual
|
assertNotAlmostEquals = assertNotAlmostEqual
|
||||||
|
assert_ = assertTrue
|
||||||
|
|
||||||
# These fail* assertion method names are pending deprecation and will
|
# These fail* assertion method names are pending deprecation and will
|
||||||
# be a DeprecationWarning in 3.2; http://bugs.python.org/issue2578
|
# be a DeprecationWarning in 3.2; http://bugs.python.org/issue2578
|
||||||
|
@ -514,7 +515,6 @@ class TestCase(object):
|
||||||
failUnlessAlmostEqual = _deprecate(assertAlmostEqual)
|
failUnlessAlmostEqual = _deprecate(assertAlmostEqual)
|
||||||
failIfAlmostEqual = _deprecate(assertNotAlmostEqual)
|
failIfAlmostEqual = _deprecate(assertNotAlmostEqual)
|
||||||
failUnless = _deprecate(assertTrue)
|
failUnless = _deprecate(assertTrue)
|
||||||
assert_ = _deprecate(assertTrue)
|
|
||||||
failUnlessRaises = _deprecate(assertRaises)
|
failUnlessRaises = _deprecate(assertRaises)
|
||||||
failIf = _deprecate(assertFalse)
|
failIf = _deprecate(assertFalse)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue