diff options
| author | Collin Winter <collinw@gmail.com> | 2009-05-20 17:46:47 (GMT) |
|---|---|---|
| committer | Collin Winter <collinw@gmail.com> | 2009-05-20 17:46:47 (GMT) |
| commit | e61d4372ed32010318d43be8f296aee58cf6d86d (patch) | |
| tree | 0303e9dadbcea73708c59ff3978a5a91020ff7b6 /Lib | |
| parent | 360bcac5fc022332a989ee4d24beebb74688f534 (diff) | |
| download | cpython-e61d4372ed32010318d43be8f296aee58cf6d86d.zip cpython-e61d4372ed32010318d43be8f296aee58cf6d86d.tar.gz cpython-e61d4372ed32010318d43be8f296aee58cf6d86d.tar.bz2 | |
Merge r72792: POP_MARK was not in pickle protocol 0, SHORT_BINBYTES was not in protocol 1.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/pickletools.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pickletools.py b/Lib/pickletools.py index cfd5fcc..2bb69d1 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -1057,7 +1057,7 @@ opcodes = [ 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 @@ 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, |