mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merged revisions 88546 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Alexander Belopolsky 2011-02-24 20:34:38 +00:00
parent f4977d2f50
commit ec8f0df229
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_pickle.py
View file

@ -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()