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

diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index cfd5fccb98b53ec35281182071d2effe79f6e487..2bb69d1320c3566b4fa143dbc6266305c7f8ccfd 100644 (file)
--- 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,