convert usage of fail* to assert*
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index ce49fdd..7306aa8 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -461,7 +461,7 @@
s = self.dumps(l, proto)
x = self.loads(s)
self.assertEqual(len(x), 1)
- self.assert_(x is x[0])
+ self.assertTrue(x is x[0])
def test_recursive_tuple(self):
t = ([],)
@@ -471,7 +471,7 @@
x = self.loads(s)
self.assertEqual(len(x), 1)
self.assertEqual(len(x[0]), 1)
- self.assert_(x is x[0][0])
+ self.assertTrue(x is x[0][0])
def test_recursive_dict(self):
d = {}
@@ -480,7 +480,7 @@
s = self.dumps(d, proto)
x = self.loads(s)
self.assertEqual(x.keys(), [1])
- self.assert_(x[1] is x)
+ self.assertTrue(x[1] is x)
def test_recursive_inst(self):
i = C()
@@ -489,7 +489,7 @@
s = self.dumps(i, 2)
x = self.loads(s)
self.assertEqual(dir(x), dir(i))
- self.assert_(x.attr is x)
+ self.assertTrue(x.attr is x)
def test_recursive_multi(self):
l = []
@@ -503,7 +503,7 @@
self.assertEqual(len(x), 1)
self.assertEqual(dir(x[0]), dir(i))
self.assertEqual(x[0].attr.keys(), [1])
- self.assert_(x[0].attr[1] is x)
+ self.assertTrue(x[0].attr[1] is x)
def test_garyp(self):
self.assertRaises(self.error, self.loads, 'garyp')
@@ -644,7 +644,7 @@
try:
self.loads(badpickle)
except ValueError, detail:
- self.failUnless(str(detail).startswith(
+ self.assertTrue(str(detail).startswith(
"unsupported pickle protocol"))
else:
self.fail("expected bad protocol number to raise ValueError")
@@ -716,7 +716,7 @@
for x in None, False, True:
s = self.dumps(x, proto)
y = self.loads(s)
- self.assert_(x is y, (proto, x, s, y))
+ self.assertTrue(x is y, (proto, x, s, y))
expected = expected_opcode[proto, x]
self.assertEqual(opcode_in_pickle(expected, s), True)
@@ -766,8 +766,8 @@
# Dump using protocol 1 for comparison.
s1 = self.dumps(x, 1)
- self.assert_(__name__ in s1)
- self.assert_("MyList" in s1)
+ self.assertTrue(__name__ in s1)
+ self.assertTrue("MyList" in s1)
self.assertEqual(opcode_in_pickle(opcode, s1), False)
y = self.loads(s1)
@@ -776,8 +776,8 @@
# Dump using protocol 2 for test.
s2 = self.dumps(x, 2)
- self.assert_(__name__ not in s2)
- self.assert_("MyList" not in s2)
+ self.assertTrue(__name__ not in s2)
+ self.assertTrue("MyList" not in s2)
self.assertEqual(opcode_in_pickle(opcode, s2), True)
y = self.loads(s2)
@@ -821,7 +821,7 @@
if proto == 0:
self.assertEqual(num_appends, 0)
else:
- self.failUnless(num_appends >= 2)
+ self.assertTrue(num_appends >= 2)
def test_dict_chunking(self):
n = 10 # too small to chunk
@@ -843,7 +843,7 @@
if proto == 0:
self.assertEqual(num_setitems, 0)
else:
- self.failUnless(num_setitems >= 2)
+ self.assertTrue(num_setitems >= 2)
def test_simple_newobj(self):
x = object.__new__(SimpleNewObj) # avoid __init__