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.
........

diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index 7121c2a09ab068568b92b5dc33fc877d8308e574..065498c2a13b98b5caa95af20fdf1de4d7d6c430 100644 (file)
--- 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,