[Python-checkins] r78134 - in python/branches/py3k: Lib/unittest/case.py

[michael.foord]

Author: michael.foord
Date: Wed Feb 10 16:52:56 2010
New Revision: 78134

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/unittest/case.py

Modified: python/branches/py3k/Lib/unittest/case.py
==============================================================================
--- python/branches/py3k/Lib/unittest/case.py	(original)
+++ python/branches/py3k/Lib/unittest/case.py	Wed Feb 10 16:52:56 2010
@@ -498,6 +498,7 @@
     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 @@
     failUnlessAlmostEqual = _deprecate(assertAlmostEqual)
     failIfAlmostEqual = _deprecate(assertNotAlmostEqual)
     failUnless = _deprecate(assertTrue)
-    assert_ = _deprecate(assertTrue)
     failUnlessRaises = _deprecate(assertRaises)
     failIf = _deprecate(assertFalse)