From e61d4372ed32010318d43be8f296aee58cf6d86d Mon Sep 17 00:00:00 2001
From: Collin Winter <collinw@gmail.com>
Date: Wed, 20 May 2009 17:46:47 +0000
Subject: [PATCH] Merge r72792: POP_MARK was not in pickle protocol 0,
 SHORT_BINBYTES was not in protocol 1.

---
 Lib/pickletools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index cfd5fccb98b..2bb69d1320c 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,