summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pickle.py
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2011-02-24 19:40:09 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2011-02-24 19:40:09 (GMT)
commit1ce92dc20d698ce46c3459da7801c76bb8518550 (patch)
tree26455f0ab85013e2095744fa179ae197500bd1aa /Lib/test/test_pickle.py
parent6c3787cb70d8efa5f70939a5db300f56a724d698 (diff)
downloadcpython-1ce92dc20d698ce46c3459da7801c76bb8518550.zip
cpython-1ce92dc20d698ce46c3459da7801c76bb8518550.tar.gz
cpython-1ce92dc20d698ce46c3459da7801c76bb8518550.tar.bz2
Issue #11286: Fixed unpickling of empty 2.x strings.
Diffstat (limited to 'Lib/test/test_pickle.py')
-rw-r--r--Lib/test/test_pickle.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 7f642c8..a3878fd 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()