traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Collin Winter 2009-05-20 17:46:47 +00:00
parent 360bcac5fc
commit e61d4372ed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/pickletools.py
View File

@ -1057,7 +1057,7 @@ opcodes = [
arg=string1, arg=string1,
stack_before=[], stack_before=[],
stack_after=[pybytes], stack_after=[pybytes],
proto=1, proto=3,
doc="""Push a Python string object. doc="""Push a Python string object.
There are two arguments: the first is a 1-byte unsigned int giving There are two arguments: the first is a 1-byte unsigned int giving
@ -1384,7 +1384,7 @@ opcodes = [
arg=None, arg=None,
stack_before=[markobject, stackslice], stack_before=[markobject, stackslice],
stack_after=[], stack_after=[],
proto=0, proto=1,
doc="""Pop all the stack objects at and above the topmost markobject. doc="""Pop all the stack objects at and above the topmost markobject.
When an opcode using a variable number of stack objects is done, When an opcode using a variable number of stack objects is done,