From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Wed, 10 Feb 2010 14:31:30 +0000 (+0000)
Subject: Remove deprecation on assert_. It is used too frequently.
X-Git-Tag: v2.7a4~204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67dfc77dfd271565a8423240aa0e9d825f34594a;p=thirdparty%2FPython%2Fcpython.git

Remove deprecation on assert_. It is used too frequently.
---

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 66f414fea11b..1227e3ba362c 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -485,6 +485,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
@@ -501,7 +502,6 @@ class TestCase(object):
     failUnlessAlmostEqual = _deprecate(assertAlmostEqual)
     failIfAlmostEqual = _deprecate(assertNotAlmostEqual)
     failUnless = _deprecate(assertTrue)
-    assert_ = _deprecate(assertTrue)
     failUnlessRaises = _deprecate(assertRaises)
     failIf = _deprecate(assertFalse)