From 0e31b992fae89ef2543155c8ae6bf3affca6a813 Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Wed, 10 Feb 2010 15:52:56 +0000 Subject: 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. ........ --- Lib/unittest/case.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py index cd0764d..64918bc 100644 --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -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) -- cgit v0.12