commit 5c8da86f3a515ce1a6d5f27fd15e3c5f4d8e931e
author Benjamin Peterson <benjamin@python.org> Tue Jun 30 22:57:08 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Tue Jun 30 22:57:08 2009 +0000
tree 41f38aca16748628d53906337f06fdf087f52314
parent be96cf608fa656d7e53144cf85082ed5661e8c13

convert usage of fail* to assert*

Lib/test/test_pyclbr.py

diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 5fbe75d..71dda22 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -35,7 +35,7 @@
         ''' succeed iff hasattr(obj,attr) or attr in ignore. '''
         if attr in ignore: return
         if not hasattr(obj, attr): print "???", attr
-        self.failUnless(hasattr(obj, attr),
+        self.assertTrue(hasattr(obj, attr),
                         'expected hasattr(%r, %r)' % (obj, attr))
 
 
@@ -44,7 +44,7 @@
         if key in ignore: return
         if not obj.has_key(key):
             print >>sys.stderr, "***",key
-        self.failUnless(obj.has_key(key))
+        self.assertTrue(obj.has_key(key))
 
     def assertEqualsOrIgnored(self, a, b, ignore):
         ''' succeed iff a == b or a in ignore or b in ignore '''
@@ -92,12 +92,12 @@
             self.assertHasattr(module, name, ignore)
             py_item = getattr(module, name)
             if isinstance(value, pyclbr.Function):
-                self.assert_(isinstance(py_item, (FunctionType, BuiltinFunctionType)))
+                self.assertTrue(isinstance(py_item, (FunctionType, BuiltinFunctionType)))
                 if py_item.__module__ != moduleName:
                     continue   # skip functions that came from somewhere else
                 self.assertEquals(py_item.__module__, value.module)
             else:
-                self.failUnless(isinstance(py_item, (ClassType, type)))
+                self.assertTrue(isinstance(py_item, (ClassType, type)))
                 if py_item.__module__ != moduleName:
                     continue   # skip classes that came from somewhere else