aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-06-30 23:06:06 +0000
committerBenjamin Peterson <benjamin@python.org>2009-06-30 23:06:06 +0000
commitc9c0f201fed21efcf669dbbf5f923eaf0eeb1db9 (patch)
tree6350dab0b481e6de307dc4e043c6230f463a9ca7 /Lib/test/test_funcattrs.py
parentMerged revisions 73710 via svnmerge from (diff)
downloadcpython-c9c0f201fed21efcf669dbbf5f923eaf0eeb1db9.tar.gz
cpython-c9c0f201fed21efcf669dbbf5f923eaf0eeb1db9.tar.bz2
cpython-c9c0f201fed21efcf669dbbf5f923eaf0eeb1db9.zip
convert old fail* assertions to assert*
Diffstat (limited to 'Lib/test/test_funcattrs.py')
-rw-r--r--Lib/test/test_funcattrs.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py
index b42f6cc4beb..5765b4e154b 100644
--- a/Lib/test/test_funcattrs.py
+++ b/Lib/test/test_funcattrs.py
@@ -35,11 +35,11 @@ class FunctionPropertiesTest(FuncAttrsTest):
def test_dir_includes_correct_attrs(self):
self.b.known_attr = 7
- self.assert_('known_attr' in dir(self.b),
+ self.assertTrue('known_attr' in dir(self.b),
"set attributes not in dir listing of method")
# Test on underlying function object of method
self.F.a.known_attr = 7
- self.assert_('known_attr' in dir(self.fi.a), "set attribute on function "
+ self.assertTrue('known_attr' in dir(self.fi.a), "set attribute on function "
"implementations, should show up in next dir")
def test_duplicate_function_equality(self):
@@ -248,11 +248,11 @@ class CellTest(unittest.TestCase):
# their presence should not be interpreted as providing any
# guarantees about the semantics (or even existence) of cell
# comparisons in future versions of CPython.
- self.assert_(cell(2) < cell(3))
- self.assert_(empty_cell() < cell('saturday'))
- self.assert_(empty_cell() == empty_cell())
- self.assert_(cell(-36) == cell(-36.0))
- self.assert_(cell(True) > empty_cell())
+ self.assertTrue(cell(2) < cell(3))
+ self.assertTrue(empty_cell() < cell('saturday'))
+ self.assertTrue(empty_cell() == empty_cell())
+ self.assertTrue(cell(-36) == cell(-36.0))
+ self.assertTrue(cell(True) > empty_cell())
class StaticMethodAttrsTest(unittest.TestCase):
def test_func_attribute(self):
@@ -260,10 +260,10 @@ class StaticMethodAttrsTest(unittest.TestCase):
pass
c = classmethod(f)
- self.assert_(c.__func__ is f)
+ self.assertTrue(c.__func__ is f)
s = staticmethod(f)
- self.assert_(s.__func__ is f)
+ self.assertTrue(s.__func__ is f)
def test_main():