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:
Michael Foord 2010-02-10 15:52:56 +00:00
parent 34c9462d71
commit 0e31b992fa
1 changed files with 1 additions and 1 deletions

View File

@ -498,6 +498,7 @@ class TestCase(object):
assertNotEquals = assertNotEqual
assertAlmostEquals = assertAlmostEqual
assertNotAlmostEquals = assertNotAlmostEqual
assert_ = assertTrue
# These fail* assertion method names are pending deprecation and will
# be a DeprecationWarning in 3.2; http://bugs.python.org/issue2578
@ -514,7 +515,6 @@ class TestCase(object):
failUnlessAlmostEqual = _deprecate(assertAlmostEqual)
failIfAlmostEqual = _deprecate(assertNotAlmostEqual)
failUnless = _deprecate(assertTrue)
assert_ = _deprecate(assertTrue)
failUnlessRaises = _deprecate(assertRaises)
failIf = _deprecate(assertFalse)