[Python-checkins] r72808 - in python/branches/release26-maint: Lib/pickletools.py

[collin.winter]

Author: collin.winter
Date: Wed May 20 21:05:16 2009
New Revision: 72808

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/pickletools.py

Modified: python/branches/release26-maint/Lib/pickletools.py
==============================================================================
--- python/branches/release26-maint/Lib/pickletools.py	(original)
+++ python/branches/release26-maint/Lib/pickletools.py	Wed May 20 21:05:16 2009
@@ -1348,7 +1348,7 @@
       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,