diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-04 13:19:02 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-04 13:19:02 (GMT) |
| commit | 296069301ac51d95fe5e30b4abf518940f10346d (patch) | |
| tree | 5637916202d583a82f6078f4bcec20badfbaa75c | |
| parent | 352cc8cfc38e0233b0a0051761afcfd842367b95 (diff) | |
| parent | aaef34483c294c79dfc4e96f3168eea0f6b0e3f8 (diff) | |
| download | cpython-296069301ac51d95fe5e30b4abf518940f10346d.zip cpython-296069301ac51d95fe5e30b4abf518940f10346d.tar.gz cpython-296069301ac51d95fe5e30b4abf518940f10346d.tar.bz2 | |
#17346: merge with 3.2.
| -rw-r--r-- | Lib/test/pickletester.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index fb04830..5d12375 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -578,10 +578,10 @@ class AbstractPickleTests(unittest.TestCase): i = C() i.attr = i for proto in protocols: - s = self.dumps(i, 2) + s = self.dumps(i, proto) x = self.loads(s) self.assertEqual(dir(x), dir(i)) - self.assertTrue(x.attr is x) + self.assertIs(x.attr, x) def test_recursive_multi(self): l = [] @@ -638,13 +638,13 @@ class AbstractPickleTests(unittest.TestCase): def test_bytes(self): for proto in protocols: for s in b'', b'xyz', b'xyz'*100: - p = self.dumps(s) + p = self.dumps(s, proto) self.assertEqual(self.loads(p), s) for s in [bytes([i]) for i in range(256)]: - p = self.dumps(s) + p = self.dumps(s, proto) self.assertEqual(self.loads(p), s) for s in [bytes([i, i]) for i in range(256)]: - p = self.dumps(s) + p = self.dumps(s, proto) self.assertEqual(self.loads(p), s) def test_ints(self): |