Issue #4740: Use HIGHEST_PROTOCOL in pickle test.

(There is no behavior difference in 2.x because HIGHEST_PROTOCOL == 2)
This commit is contained in:
Hirokazu Yamamoto 2008-12-27 04:19:48 +00:00
parent 1e551b47d3
commit 0fc0747586
3 changed files with 6 additions and 6 deletions

View File

@ -7,7 +7,7 @@ import unittest
from test import test_support
from weakref import proxy
import array, cStringIO
from cPickle import loads, dumps
from cPickle import loads, dumps, HIGHEST_PROTOCOL
class ArraySubclass(array.array):
pass
@ -97,7 +97,7 @@ class BaseTest(unittest.TestCase):
self.assertEqual(a, b)
def test_pickle(self):
for protocol in (0, 1, 2):
for protocol in range(HIGHEST_PROTOCOL + 1):
a = array.array(self.typecode, self.example)
b = loads(dumps(a, protocol))
self.assertNotEqual(id(a), id(b))
@ -112,7 +112,7 @@ class BaseTest(unittest.TestCase):
self.assertEqual(type(a), type(b))
def test_pickle_for_empty_array(self):
for protocol in (0, 1, 2):
for protocol in range(HIGHEST_PROTOCOL + 1):
a = array.array(self.typecode)
b = loads(dumps(a, protocol))
self.assertNotEqual(id(a), id(b))

View File

@ -373,7 +373,7 @@ class TestBasic(unittest.TestCase):
def test_pickle(self):
d = deque(xrange(200))
for i in (0, 1, 2):
for i in range(pickle.HIGHEST_PROTOCOL + 1):
s = pickle.dumps(d, i)
e = pickle.loads(s)
self.assertNotEqual(id(d), id(e))
@ -382,7 +382,7 @@ class TestBasic(unittest.TestCase):
## def test_pickle_recursive(self):
## d = deque('abc')
## d.append(d)
## for i in (0, 1, 2):
## for i in range(pickle.HIGHEST_PROTOCOL + 1):
## e = pickle.loads(pickle.dumps(d, i))
## self.assertNotEqual(id(d), id(e))
## self.assertEqual(id(e), id(e[-1]))

View File

@ -221,7 +221,7 @@ class TestJointOps(unittest.TestCase):
self.failIf(set('cbs').issuperset('a'))
def test_pickling(self):
for i in (0, 1, 2):
for i in range(pickle.HIGHEST_PROTOCOL + 1):
p = pickle.dumps(self.s, i)
dup = pickle.loads(p)
self.assertEqual(self.s, dup, "%s != %s" % (self.s, dup))