[Python-checkins] r72793 - in python/branches/py3k: Lib/pickletools.py

[collin.winter]

Author: collin.winter
Date: Wed May 20 19:46:47 2009
New Revision: 72793

Log:
Merge r72792: POP_MARK was not in pickle protocol 0, SHORT_BINBYTES was not in protocol 1.


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/pickletools.py

Modified: python/branches/py3k/Lib/pickletools.py
==============================================================================
--- python/branches/py3k/Lib/pickletools.py	(original)
+++ python/branches/py3k/Lib/pickletools.py	Wed May 20 19:46:47 2009
@@ -1057,7 +1057,7 @@
       arg=string1,
       stack_before=[],
       stack_after=[pybytes],
-      proto=1,
+      proto=3,
       doc="""Push a Python string object.
 
       There are two arguments:  the first is a 1-byte unsigned int giving
@@ -1384,7 +1384,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,