[Python-checkins] cpython (merge 3.2 -> 3.3): #17346: merge with 3.2.

Mon Mar 4 14:23:28 CET 2013

http://hg.python.org/cpython/rev/796de4f7df07
changeset: 82473:796de4f7df07
branch: 3.3
parent: 82470:052b90daf8b9
parent: 82472:a982feb29584
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Mon Mar 04 15:19:02 2013 +0200
summary:
 #17346: merge with 3.2.
files:
 Lib/test/pickletester.py | 10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -578,10 +578,10 @@
 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 @@
 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):
-- 
Repository URL: http://hg.python.org/cpython
