summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-12-27 04:21:44 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-12-27 04:21:44 (GMT)
commit801f9d3888f4e2f44fe5aa7e9e46f8620a60702f (patch)
tree2f03e47c1ac595cb6db3fdeb1c5354753b2d0307 /Lib/test
parent81d90a220f2cea407e261a3c884d388a084d2d1e (diff)
downloadcpython-801f9d3888f4e2f44fe5aa7e9e46f8620a60702f.zip
cpython-801f9d3888f4e2f44fe5aa7e9e46f8620a60702f.tar.gz
cpython-801f9d3888f4e2f44fe5aa7e9e46f8620a60702f.tar.bz2
Issue #4740: Use HIGHEST_PROTOCOL in pickle test. This enables test for protocol 3
(== HIGHEST_PROTOCOL in 3.x)
Diffstat (limited to 'Lib/test')
-rwxr-xr-xLib/test/test_array.py6
-rw-r--r--Lib/test/test_deque.py4
-rw-r--r--Lib/test/test_set.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index 5a505de..2b80a7d 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -7,7 +7,7 @@ import unittest
from test import support
from weakref import proxy
import array, io, math
-from pickle import loads, dumps
+from pickle import loads, dumps, HIGHEST_PROTOCOL
import operator
class ArraySubclass(array.array):
@@ -98,7 +98,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))
@@ -113,7 +113,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 1ac43da..7af0803 100644
--- a/Lib/test/test_deque.py
+++ b/Lib/test/test_deque.py
@@ -375,7 +375,7 @@ class TestBasic(unittest.TestCase):
def test_pickle(self):
d = deque(range(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))
@@ -384,7 +384,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 07319fc..da3ed0f 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -219,7 +219,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))