From e6a02d08233b120e198fcb5cc59815fa337807c4 Mon Sep 17 00:00:00 2001 From: Collin Winter Date: Wed, 20 May 2009 19:05:16 +0000 Subject: Merged revisions 72792 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72792 | collin.winter | 2009-05-20 09:49:12 -0700 (Wed, 20 May 2009) | 1 line Issue 6066: POP_MARK was not in pickle protocol 0. ........ --- Lib/pickletools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/pickletools.py b/Lib/pickletools.py index 7121c2a..065498c 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -1348,7 +1348,7 @@ opcodes = [ arg=None, stack_before=[markobject, stackslice], stack_after=[], - proto=0, + proto=1, doc="""Pop all the stack objects at and above the topmost markobject. When an opcode using a variable number of stack objects is done, -- cgit v0.12