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.
........

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index cd0764d5c24efb4a20538caf1c88352ca002870a..64918bc03fefe9334067cf87b7c4b27ca0a7faea 100644 (file)
--- 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)