[Python-3000-checkins] r67003 - in python/branches/py3k/Lib/test: test_bytes.py test_range.py

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Thu Oct 23 02:38:15 2008
New Revision: 67003

Log:
Issue #4183: Some tests didn't run with pickle.HIGHEST_PROTOCOL.

Modified:
python/branches/py3k/Lib/test/test_bytes.py
python/branches/py3k/Lib/test/test_range.py

Modified: python/branches/py3k/Lib/test/test_bytes.py
==============================================================================
--- python/branches/py3k/Lib/test/test_bytes.py (original)
+++ python/branches/py3k/Lib/test/test_bytes.py Thu Oct 23 02:38:15 2008
@@ -397,7 +397,7 @@
self.assertEqual(b.rpartition(b'i'), (b'mississipp', b'i', b''))

def test_pickling(self):
- for proto in range(pickle.HIGHEST_PROTOCOL):
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
for b in b"", b"a", b"abc", b"\xffab\x80", b"\0\0\377\0\0":
b = self.type2test(b)
ps = pickle.dumps(b, proto)
@@ -979,7 +979,7 @@
a = ByteArraySubclass(b"abcd")
a.x = 10
a.y = ByteArraySubclass(b"efgh")
- for proto in range(pickle.HIGHEST_PROTOCOL):
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
b = pickle.loads(pickle.dumps(a, proto))
self.assertNotEqual(id(a), id(b))
self.assertEqual(a, b)

Modified: python/branches/py3k/Lib/test/test_range.py
==============================================================================
--- python/branches/py3k/Lib/test/test_range.py (original)
+++ python/branches/py3k/Lib/test/test_range.py Thu Oct 23 02:38:15 2008
@@ -65,7 +65,7 @@
def test_pickling(self):
testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1),
(13, 21, 3), (-2, 2, 2)]
- for proto in range(pickle.HIGHEST_PROTOCOL):
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
for t in testcases:
r = range(*t)
self.assertEquals(list(pickle.loads(pickle.dumps(r, proto))),