summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pickletools.py
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2011-02-24 20:34:38 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2011-02-24 20:34:38 (GMT)
commitec8f0df2296cfb88cd932eeb053edaa316600725 (patch)
tree94137b33f9b53ce5a2034844d8aa6d26c8a48905 /Lib/test/test_pickletools.py
parentf4977d2f503fb8c2dd2376936683653f0d94c3e7 (diff)
downloadcpython-ec8f0df2296cfb88cd932eeb053edaa316600725.zip
cpython-ec8f0df2296cfb88cd932eeb053edaa316600725.tar.gz
cpython-ec8f0df2296cfb88cd932eeb053edaa316600725.tar.bz2
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. ........
Diffstat (limited to 'Lib/test/test_pickletools.py')
-rw-r--r--Lib/test/test_pickletools.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_pickletools.py b/Lib/test/test_pickletools.py
index 823b0c2..d37ac26 100644
--- a/Lib/test/test_pickletools.py
+++ b/Lib/test/test_pickletools.py
@@ -9,8 +9,8 @@ class OptimizedPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
def dumps(self, arg, proto=None):
return pickletools.optimize(pickle.dumps(arg, proto))
- def loads(self, buf):
- return pickle.loads(buf)
+ def loads(self, buf, **kwds):
+ return pickle.loads(buf, **kwds)
# Test relies on precise output of dumps()
test_pickle_to_2x = None