diff options
author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-12-27 04:19:48 (GMT) |
---|---|---|
committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-12-27 04:19:48 (GMT) |
commit | 0fc074758670e56bcc61123a641a345cbe1988e3 (patch) | |
tree | a99483147f5392d1795c098e2444a2fa9df16f7b /Lib | |
parent | 1e551b47d368e3a84ec084c1082b74393a586303 (diff) | |
download | cpython-0fc074758670e56bcc61123a641a345cbe1988e3.zip cpython-0fc074758670e56bcc61123a641a345cbe1988e3.tar.gz cpython-0fc074758670e56bcc61123a641a345cbe1988e3.tar.bz2 |
Issue #4740: Use HIGHEST_PROTOCOL in pickle test.
(There is no behavior difference in 2.x because HIGHEST_PROTOCOL == 2)
Diffstat (limited to 'Lib')
-rwxr-xr-x | Lib/test/test_array.py | 6 | ||||
-rw-r--r-- | Lib/test/test_deque.py | 4 | ||||
-rw-r--r-- | Lib/test/test_set.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py index 2efbc7d..2c4c2fd 100755 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -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)) diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py index 0b751d8..0f0d098 100644 --- a/Lib/test/test_deque.py +++ b/Lib/test/test_deque.py @@ -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])) diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index 499406f..d38a675 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -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)) |