diff options
| author | Collin Winter <collinw@gmail.com> | 2009-05-20 19:05:16 (GMT) |
|---|---|---|
| committer | Collin Winter <collinw@gmail.com> | 2009-05-20 19:05:16 (GMT) |
| commit | e6a02d08233b120e198fcb5cc59815fa337807c4 (patch) | |
| tree | e201202000d1be831955af388ccf02f9a8f55844 /Lib | |
| parent | 75f446d42e06c01cd4eecb0b2cb9358e12ffd77a (diff) | |
| download | cpython-e6a02d08233b120e198fcb5cc59815fa337807c4.zip cpython-e6a02d08233b120e198fcb5cc59815fa337807c4.tar.gz cpython-e6a02d08233b120e198fcb5cc59815fa337807c4.tar.bz2 | |
Merged revisions 72792 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72792 | collin.winter | 2009-05-20 09:49:12 -0700 (Wed, 20 May 2009) | 1 line
Issue 6066: POP_MARK was not in pickle protocol 0.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/pickletools.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/pickletools.py b/Lib/pickletools.py index 7121c2a..065498c 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -1348,7 +1348,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, |