Silence deprecations under Py3k.

BTrees/tests/testBTrees.py

@@ -121,7 +121,7 @@ class DegenerateBTree(unittest.TestCase):
         self.assertEqual(t.has_key(7), 5)
         self.assertEqual(t.has_key(11), 5)
         for i in 0, 2, 4, 6, 8, 9, 10, 12:
-            self.assert_(i not in t)
+            self.assertTrue(i not in t)
 
     def _checkRanges(self, tree, keys):
         self.assertEqual(len(tree), len(keys))
@@ -129,7 +129,7 @@ class DegenerateBTree(unittest.TestCase):
         sorted_keys.sort()
         self.assertEqual(list(tree.keys()), sorted_keys)
         for k in keys:
-            self.assert_(k in tree)
+            self.assertTrue(k in tree)
         if keys:
             lokey = sorted_keys[0]
             hikey = sorted_keys[-1]
@@ -430,22 +430,22 @@ class FamilyTest(unittest.TestCase):
         import BTrees
         from BTrees.IOBTree import IOTreeSet
         verifyObject(BTrees.Interfaces.IBTreeFamily, BTrees.family32)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family32.IO, BTrees.IOBTree)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family32.OI, BTrees.OIBTree)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family32.II, BTrees.IIBTree)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family32.IF, BTrees.IFBTree)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family32.OO, BTrees.OOBTree)
         s = IOTreeSet()
         s.insert(BTrees.family32.maxint)
-        self.assert_(BTrees.family32.maxint in s)
+        self.assertTrue(BTrees.family32.maxint in s)
         s = IOTreeSet()
         s.insert(BTrees.family32.minint)
-        self.assert_(BTrees.family32.minint in s)
+        self.assertTrue(BTrees.family32.minint in s)
         s = IOTreeSet()
         # this next bit illustrates an, um, "interesting feature".  If
         # the characteristics change to match the 64 bit version, please
@@ -460,22 +460,22 @@ class FamilyTest(unittest.TestCase):
         import BTrees
         from BTrees.LOBTree import LOTreeSet
         verifyObject(BTrees.Interfaces.IBTreeFamily, BTrees.family64)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family64.IO, BTrees.LOBTree)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family64.OI, BTrees.OLBTree)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family64.II, BTrees.LLBTree)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family64.IF, BTrees.LFBTree)
-        self.assertEquals(
+        self.assertEqual(
             BTrees.family64.OO, BTrees.OOBTree)
         s = LOTreeSet()
         s.insert(BTrees.family64.maxint)
-        self.assert_(BTrees.family64.maxint in s)
+        self.assertTrue(BTrees.family64.maxint in s)
         s = LOTreeSet()
         s.insert(BTrees.family64.minint)
-        self.assert_(BTrees.family64.minint in s)
+        self.assertTrue(BTrees.family64.minint in s)
         s = LOTreeSet()
         # XXX why oh why do we expect ValueError here, but TypeError in test32?
         self.assertRaises(ValueError, s.insert, BTrees.family64.maxint + 1)

BTrees/tests/testConflict.py

@@ -332,11 +332,11 @@ class NastyConfictFunctionalTests(ConflictTestBase, unittest.TestCase):
         state1 = bucket.__getstate__()
         state2 = bucket.__getstate__()
         state3 = bucket.__getstate__()
-        self.assert_(state2 is not state1 and
-                     state2 is not state3 and
-                     state3 is not state1)
-        self.assert_(state2 == state1 and
-                     state3 == state1)
+        self.assertTrue(state2 is not state1 and
+                        state2 is not state3 and
+                        state3 is not state1)
+        self.assertTrue(state2 == state1 and
+                        state3 == state1)
         self.assertRaises(BTreesConflictError, bucket._p_resolveConflict,
                           state1, state2, state3)
         # When an empty BTree resolves conflicts, it computes the

BTrees/tests/test_Length.py

@@ -71,10 +71,10 @@ class LengthTestCase(unittest.TestCase):
             return
         else: #pragma NO COVER Py2
             self.assertEqual(length(), sys.maxint)
-            self.assert_(type(length()) is int)
+            self.assertTrue(type(length()) is int)
             length.change(+1)
             self.assertEqual(length(), sys.maxint + 1)
-            self.assert_(type(length()) is long)
+            self.assertTrue(type(length()) is long)
 
     def test_change_underflows_to_long(self):
         import sys
@@ -85,10 +85,10 @@ class LengthTestCase(unittest.TestCase):
         else: #pragma NO COVER Py2
             length = self._makeOne(minint)
             self.assertEqual(length(), minint)
-            self.assert_(type(length()) is int)
+            self.assertTrue(type(length()) is int)
             length.change(-1)
             self.assertEqual(length(), minint - 1)
-            self.assert_(type(length()) is long)
+            self.assertTrue(type(length()) is long)
 
     def test___call___no_args(self):
         length = self._makeOne(42)

BTrees/tests/test_btreesubclass.py

@@ -38,7 +38,7 @@ class SubclassTest(unittest.TestCase):
             t[i] = i
 
         state = t.__getstate__()
-        self.assert_(state[0][0].__class__ is B)
+        self.assertTrue(state[0][0].__class__ is B)
 
 def test_suite():
     return unittest.makeSuite(SubclassTest)