summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-02-10 15:52:56 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-02-10 15:52:56 (GMT)
commit0e31b992fae89ef2543155c8ae6bf3affca6a813 (patch)
tree97261c4343d115b126c9804e3050cf984881380e
parent34c9462d713275762803f102a68f23dd2bb7460a (diff)
downloadcpython-0e31b992fae89ef2543155c8ae6bf3affca6a813.zip
cpython-0e31b992fae89ef2543155c8ae6bf3affca6a813.tar.gz
cpython-0e31b992fae89ef2543155c8ae6bf3affca6a813.tar.bz2
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. ........
-rw-r--r--Lib/unittest/case.py2
1 files changed, 1 insertions, 1 deletions
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)