From: Collin Winter <collinw@gmail.com>
Date: Wed, 20 May 2009 19:05:16 +0000 (+0000)
Subject: Merged revisions 72792 via svnmerge from
X-Git-Tag: v2.6.3rc1~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6a02d08233b120e198fcb5cc59815fa337807c4;p=thirdparty%2FPython%2Fcpython.git

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 7121c2a09ab0..065498c2a13b 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,