From ec8f0df2296cfb88cd932eeb053edaa316600725 Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Thu, 24 Feb 2011 20:34:38 +0000 Subject: Merged revisions 88546 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88546 | alexander.belopolsky | 2011-02-24 14:40:09 -0500 (Thu, 24 Feb 2011) | 3 lines Issue #11286: Fixed unpickling of empty 2.x strings. ........ --- Lib/test/test_pickle.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Lib/test/test_pickle.py') diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py index 7f642c8b80..a3878fd62a 100644 --- a/Lib/test/test_pickle.py +++ b/Lib/test/test_pickle.py @@ -31,9 +31,9 @@ class PyPicklerTests(AbstractPickleTests): f.seek(0) return bytes(f.read()) - def loads(self, buf): + def loads(self, buf, **kwds): f = io.BytesIO(buf) - u = self.unpickler(f) + u = self.unpickler(f, **kwds) return u.load() @@ -45,8 +45,8 @@ class InMemoryPickleTests(AbstractPickleTests): def dumps(self, arg, proto=None): return pickle.dumps(arg, proto) - def loads(self, buf): - return pickle.loads(buf) + def loads(self, buf, **kwds): + return pickle.loads(buf, **kwds) class PyPersPicklerTests(AbstractPersistentPicklerTests): @@ -64,12 +64,12 @@ class PyPersPicklerTests(AbstractPersistentPicklerTests): f.seek(0) return f.read() - def loads(self, buf): + def loads(self, buf, **kwds): class PersUnpickler(self.unpickler): def persistent_load(subself, obj): return self.persistent_load(obj) f = io.BytesIO(buf) - u = PersUnpickler(f) + u = PersUnpickler(f, **kwds) return u.load() -- cgit v1.2.1