[Checkins] SVN: BTrees/branches/py3k/ More Py3k deprecation whack-a-mole salad.

[Tres Seaver]

Log message for revision 128619:
  More Py3k deprecation whack-a-mole salad.

Changed:
  _U  BTrees/branches/py3k/
  U   BTrees/branches/py3k/BTrees/tests/testBTrees.py

-=-
Modified: BTrees/branches/py3k/BTrees/tests/testBTrees.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/testBTrees.py	2012-12-12 14:41:01 UTC (rev 128618)
+++ BTrees/branches/py3k/BTrees/tests/testBTrees.py	2012-12-12 14:41:03 UTC (rev 128619)
@@ -492,8 +492,8 @@
 
         s = pickle.dumps((family, family))
         (f1, f2) = pickle.loads(s)
-        self.failUnless(f1 is family)
-        self.failUnless(f2 is family)
+        self.assertTrue(f1 is family)
+        self.assertTrue(f2 is family)
 
         # Using a single memo across multiple pickles:
         sio = BytesIO()
@@ -503,8 +503,8 @@
         u = pickle.Unpickler(BytesIO(sio.getvalue()))
         f1 = u.load()
         f2, = u.load()
-        self.failUnless(f1 is family)
-        self.failUnless(f2 is family)
+        self.assertTrue(f1 is family)
+        self.assertTrue(f2 is family)
 
         # Using separate memos for each pickle:
         sio = BytesIO()
@@ -515,8 +515,8 @@
         u = pickle.Unpickler(BytesIO(sio.getvalue()))
         f1 = u.load()
         f2, = u.load()
-        self.failUnless(f1 is family)
-        self.failUnless(f2 is family)
+        self.assertTrue(f1 is family)
+        self.assertTrue(f2 is family)
 
 
 def test_suite():