2000-02-04 11:10:34 -04:00
|
|
|
"""Create portable serialized representations of Python objects.
|
1997-12-05 15:42:42 -04:00
|
|
|
|
|
|
|
See module copy_reg for a mechanism for registering custom picklers.
|
2003-01-27 16:16:36 -04:00
|
|
|
See module pickletools source for extensive comments.
|
1997-12-05 15:42:42 -04:00
|
|
|
|
|
|
|
Classes:
|
|
|
|
|
|
|
|
Pickler
|
|
|
|
Unpickler
|
|
|
|
|
|
|
|
Functions:
|
|
|
|
|
|
|
|
dump(object, file)
|
|
|
|
dumps(object) -> string
|
|
|
|
load(file) -> object
|
|
|
|
loads(string) -> object
|
|
|
|
|
|
|
|
Misc variables:
|
|
|
|
|
1998-02-12 23:24:48 -04:00
|
|
|
__version__
|
1997-12-05 15:42:42 -04:00
|
|
|
format_version
|
|
|
|
compatible_formats
|
|
|
|
|
1995-01-09 20:31:14 -04:00
|
|
|
"""
|
|
|
|
|
1998-09-15 17:25:57 -03:00
|
|
|
__version__ = "$Revision$" # Code version
|
1995-01-09 20:31:14 -04:00
|
|
|
|
2007-06-07 20:15:56 -03:00
|
|
|
from types import FunctionType, BuiltinFunctionType
|
2003-02-18 18:49:10 -04:00
|
|
|
from copy_reg import dispatch_table
|
2003-02-03 21:54:49 -04:00
|
|
|
from copy_reg import _extension_registry, _inverted_registry, _extension_cache
|
1998-10-22 17:15:36 -03:00
|
|
|
import marshal
|
|
|
|
import sys
|
|
|
|
import struct
|
2001-02-17 23:10:09 -04:00
|
|
|
import re
|
2007-05-04 16:56:22 -03:00
|
|
|
import io
|
2007-06-12 13:40:17 -03:00
|
|
|
import codecs
|
1995-01-09 20:31:14 -04:00
|
|
|
|
2001-02-07 19:14:30 -04:00
|
|
|
__all__ = ["PickleError", "PicklingError", "UnpicklingError", "Pickler",
|
|
|
|
"Unpickler", "dump", "dumps", "load", "loads"]
|
|
|
|
|
2003-01-28 20:56:17 -04:00
|
|
|
# These are purely informational; no code uses these.
|
2003-01-27 18:47:53 -04:00
|
|
|
format_version = "2.0" # File format version we write
|
|
|
|
compatible_formats = ["1.0", # Original protocol 0
|
2003-01-28 12:34:19 -04:00
|
|
|
"1.1", # Protocol 0 with INST added
|
2003-01-27 18:47:53 -04:00
|
|
|
"1.2", # Original protocol 1
|
|
|
|
"1.3", # Protocol 1 with BINFLOAT added
|
|
|
|
"2.0", # Protocol 2
|
|
|
|
] # Old format versions we can read
|
1995-03-14 11:09:05 -04:00
|
|
|
|
2007-07-19 21:22:32 -03:00
|
|
|
# This is the highest protocol number we know how to read.
|
2003-02-13 11:44:41 -04:00
|
|
|
HIGHEST_PROTOCOL = 2
|
|
|
|
|
2007-05-04 16:56:22 -03:00
|
|
|
# The protocol we write by default. May be less than HIGHEST_PROTOCOL.
|
|
|
|
DEFAULT_PROTOCOL = 2
|
|
|
|
|
2003-01-27 23:17:21 -04:00
|
|
|
# Why use struct.pack() for pickling but marshal.loads() for
|
2003-01-28 20:56:17 -04:00
|
|
|
# unpickling? struct.pack() is 40% faster than marshal.dumps(), but
|
2003-01-27 23:17:21 -04:00
|
|
|
# marshal.loads() is twice as fast as struct.unpack()!
|
1997-04-09 14:32:51 -03:00
|
|
|
mloads = marshal.loads
|
1995-03-09 10:08:35 -04:00
|
|
|
|
2002-05-29 13:18:42 -03:00
|
|
|
class PickleError(Exception):
|
2002-05-30 09:12:04 -03:00
|
|
|
"""A common base class for the other pickling exceptions."""
|
2002-05-29 13:18:42 -03:00
|
|
|
pass
|
|
|
|
|
|
|
|
class PicklingError(PickleError):
|
|
|
|
"""This exception is raised when an unpicklable object is passed to the
|
|
|
|
dump() method.
|
|
|
|
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
class UnpicklingError(PickleError):
|
|
|
|
"""This exception is raised when there is a problem unpickling an object,
|
|
|
|
such as a security violation.
|
|
|
|
|
|
|
|
Note that other exceptions may also be raised during unpickling, including
|
|
|
|
(but not necessarily limited to) AttributeError, EOFError, ImportError,
|
|
|
|
and IndexError.
|
|
|
|
|
|
|
|
"""
|
|
|
|
pass
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 20:56:17 -04:00
|
|
|
# An instance of _Stop is raised by Unpickler.load_stop() in response to
|
|
|
|
# the STOP opcode, passing the object that is the result of unpickling.
|
2000-12-13 14:11:56 -04:00
|
|
|
class _Stop(Exception):
|
|
|
|
def __init__(self, value):
|
|
|
|
self.value = value
|
|
|
|
|
2003-01-28 13:55:05 -04:00
|
|
|
# Jython has PyStringMap; it's a dict subclass with string keys
|
1998-05-27 19:38:22 -03:00
|
|
|
try:
|
|
|
|
from org.python.core import PyStringMap
|
|
|
|
except ImportError:
|
|
|
|
PyStringMap = None
|
|
|
|
|
2003-01-27 16:16:36 -04:00
|
|
|
# Pickle opcodes. See pickletools.py for extensive docs. The listing
|
|
|
|
# here is in kind-of alphabetical order of 1-character pickle code.
|
|
|
|
# pickletools groups them by purpose.
|
|
|
|
|
2007-05-04 16:56:22 -03:00
|
|
|
MARK = b'(' # push special markobject on stack
|
|
|
|
STOP = b'.' # every pickle ends with STOP
|
|
|
|
POP = b'0' # discard topmost stack item
|
|
|
|
POP_MARK = b'1' # discard stack top through topmost markobject
|
|
|
|
DUP = b'2' # duplicate top stack item
|
|
|
|
FLOAT = b'F' # push float object; decimal string argument
|
|
|
|
INT = b'I' # push integer or bool; decimal string argument
|
|
|
|
BININT = b'J' # push four-byte signed int
|
|
|
|
BININT1 = b'K' # push 1-byte unsigned int
|
|
|
|
LONG = b'L' # push long; decimal string argument
|
|
|
|
BININT2 = b'M' # push 2-byte unsigned int
|
|
|
|
NONE = b'N' # push None
|
|
|
|
PERSID = b'P' # push persistent object; id is taken from string arg
|
|
|
|
BINPERSID = b'Q' # " " " ; " " " " stack
|
|
|
|
REDUCE = b'R' # apply callable to argtuple, both on stack
|
|
|
|
STRING = b'S' # push string; NL-terminated string argument
|
|
|
|
BINSTRING = b'T' # push string; counted binary string argument
|
|
|
|
SHORT_BINSTRING= b'U' # " " ; " " " " < 256 bytes
|
|
|
|
UNICODE = b'V' # push Unicode string; raw-unicode-escaped'd argument
|
|
|
|
BINUNICODE = b'X' # " " " ; counted UTF-8 string argument
|
|
|
|
APPEND = b'a' # append stack top to list below it
|
|
|
|
BUILD = b'b' # call __setstate__ or __dict__.update()
|
|
|
|
GLOBAL = b'c' # push self.find_class(modname, name); 2 string args
|
|
|
|
DICT = b'd' # build a dict from stack items
|
|
|
|
EMPTY_DICT = b'}' # push empty dict
|
|
|
|
APPENDS = b'e' # extend list on stack by topmost stack slice
|
|
|
|
GET = b'g' # push item from memo on stack; index is string arg
|
|
|
|
BINGET = b'h' # " " " " " " ; " " 1-byte arg
|
|
|
|
INST = b'i' # build & push class instance
|
|
|
|
LONG_BINGET = b'j' # push item from memo on stack; index is 4-byte arg
|
|
|
|
LIST = b'l' # build list from topmost stack items
|
|
|
|
EMPTY_LIST = b']' # push empty list
|
|
|
|
OBJ = b'o' # build & push class instance
|
|
|
|
PUT = b'p' # store stack top in memo; index is string arg
|
|
|
|
BINPUT = b'q' # " " " " " ; " " 1-byte arg
|
|
|
|
LONG_BINPUT = b'r' # " " " " " ; " " 4-byte arg
|
|
|
|
SETITEM = b's' # add key+value pair to dict
|
|
|
|
TUPLE = b't' # build tuple from topmost stack items
|
|
|
|
EMPTY_TUPLE = b')' # push empty tuple
|
|
|
|
SETITEMS = b'u' # modify dict by adding topmost key+value pairs
|
|
|
|
BINFLOAT = b'G' # push float; arg is 8-byte float encoding
|
|
|
|
|
|
|
|
TRUE = b'I01\n' # not an opcode; see INT docs in pickletools.py
|
|
|
|
FALSE = b'I00\n' # not an opcode; see INT docs in pickletools.py
|
2002-04-03 18:41:51 -04:00
|
|
|
|
2003-01-29 02:16:12 -04:00
|
|
|
# Protocol 2
|
2003-01-27 20:22:12 -04:00
|
|
|
|
2007-05-04 16:56:22 -03:00
|
|
|
PROTO = b'\x80' # identify pickle protocol
|
|
|
|
NEWOBJ = b'\x81' # build object by applying cls.__new__ to argtuple
|
|
|
|
EXT1 = b'\x82' # push object from extension registry; 1-byte index
|
|
|
|
EXT2 = b'\x83' # ditto, but 2-byte index
|
|
|
|
EXT4 = b'\x84' # ditto, but 4-byte index
|
|
|
|
TUPLE1 = b'\x85' # build 1-tuple from stack top
|
|
|
|
TUPLE2 = b'\x86' # build 2-tuple from two topmost stack items
|
|
|
|
TUPLE3 = b'\x87' # build 3-tuple from three topmost stack items
|
|
|
|
NEWTRUE = b'\x88' # push True
|
|
|
|
NEWFALSE = b'\x89' # push False
|
|
|
|
LONG1 = b'\x8a' # push long from < 256 bytes
|
|
|
|
LONG4 = b'\x8b' # push really big long
|
2003-01-27 17:44:25 -04:00
|
|
|
|
2003-01-28 00:14:51 -04:00
|
|
|
_tuplesize2code = [EMPTY_TUPLE, TUPLE1, TUPLE2, TUPLE3]
|
|
|
|
|
1995-01-09 20:31:14 -04:00
|
|
|
|
2001-02-17 23:10:09 -04:00
|
|
|
__all__.extend([x for x in dir() if re.match("[A-Z][A-Z0-9_]+$",x)])
|
|
|
|
|
2003-01-28 11:19:53 -04:00
|
|
|
|
|
|
|
# Pickling machinery
|
|
|
|
|
1995-01-09 20:31:14 -04:00
|
|
|
class Pickler:
|
|
|
|
|
2004-12-05 01:20:42 -04:00
|
|
|
def __init__(self, file, protocol=None):
|
2007-05-04 16:56:22 -03:00
|
|
|
"""This takes a binary file for writing a pickle data stream.
|
|
|
|
|
|
|
|
All protocols now read and write bytes.
|
2002-05-29 13:18:42 -03:00
|
|
|
|
2003-02-09 13:19:41 -04:00
|
|
|
The optional protocol argument tells the pickler to use the
|
|
|
|
given protocol; supported protocols are 0, 1, 2. The default
|
2007-05-04 16:56:22 -03:00
|
|
|
protocol is 2; it's been supported for many years now.
|
2003-01-27 18:47:53 -04:00
|
|
|
|
|
|
|
Protocol 1 is more efficient than protocol 0; protocol 2 is
|
2003-01-31 15:42:31 -04:00
|
|
|
more efficient than protocol 1.
|
2003-01-27 18:47:53 -04:00
|
|
|
|
2003-01-31 15:42:31 -04:00
|
|
|
Specifying a negative protocol version selects the highest
|
2003-02-01 12:45:06 -04:00
|
|
|
protocol version supported. The higher the protocol used, the
|
|
|
|
more recent the version of Python needed to read the pickle
|
|
|
|
produced.
|
2002-05-29 13:18:42 -03:00
|
|
|
|
|
|
|
The file parameter must have a write() method that accepts a single
|
|
|
|
string argument. It can thus be an open file object, a StringIO
|
|
|
|
object, or any other custom object that meets this interface.
|
|
|
|
|
|
|
|
"""
|
2003-02-09 13:19:41 -04:00
|
|
|
if protocol is None:
|
2007-05-04 16:56:22 -03:00
|
|
|
protocol = DEFAULT_PROTOCOL
|
2003-02-09 13:19:41 -04:00
|
|
|
if protocol < 0:
|
2003-02-13 11:44:41 -04:00
|
|
|
protocol = HIGHEST_PROTOCOL
|
|
|
|
elif not 0 <= protocol <= HIGHEST_PROTOCOL:
|
|
|
|
raise ValueError("pickle protocol must be <= %d" % HIGHEST_PROTOCOL)
|
1997-04-09 14:32:51 -03:00
|
|
|
self.write = file.write
|
|
|
|
self.memo = {}
|
2003-02-09 13:19:41 -04:00
|
|
|
self.proto = int(protocol)
|
|
|
|
self.bin = protocol >= 1
|
2003-01-29 13:58:45 -04:00
|
|
|
self.fast = 0
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2002-05-01 17:33:53 -03:00
|
|
|
def clear_memo(self):
|
2002-05-29 13:18:42 -03:00
|
|
|
"""Clears the pickler's "memo".
|
|
|
|
|
|
|
|
The memo is the data structure that remembers which objects the
|
2003-01-27 20:23:36 -04:00
|
|
|
pickler has already seen, so that shared or recursive objects are
|
|
|
|
pickled by reference and not by value. This method is useful when
|
|
|
|
re-using picklers.
|
2002-05-29 13:18:42 -03:00
|
|
|
|
|
|
|
"""
|
2002-05-01 17:33:53 -03:00
|
|
|
self.memo.clear()
|
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def dump(self, obj):
|
2003-02-01 12:45:06 -04:00
|
|
|
"""Write a pickled representation of obj to the open file."""
|
2003-01-27 23:49:52 -04:00
|
|
|
if self.proto >= 2:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(PROTO + bytes([self.proto]))
|
2003-01-28 11:10:22 -04:00
|
|
|
self.save(obj)
|
1997-04-09 14:32:51 -03:00
|
|
|
self.write(STOP)
|
|
|
|
|
2003-01-24 15:29:52 -04:00
|
|
|
def memoize(self, obj):
|
|
|
|
"""Store an object in the memo."""
|
|
|
|
|
2003-01-27 17:22:10 -04:00
|
|
|
# The Pickler memo is a dictionary mapping object ids to 2-tuples
|
|
|
|
# that contain the Unpickler memo key and the object being memoized.
|
|
|
|
# The memo key is written to the pickle and will become
|
2003-01-24 15:29:52 -04:00
|
|
|
# the key in the Unpickler's memo. The object is stored in the
|
2003-01-27 17:22:10 -04:00
|
|
|
# Pickler memo so that transient objects are kept alive during
|
|
|
|
# pickling.
|
|
|
|
|
|
|
|
# The use of the Unpickler memo length as the memo key is just a
|
|
|
|
# convention. The only requirement is that the memo values be unique.
|
|
|
|
# But there appears no advantage to any other scheme, and this
|
2003-01-27 20:24:43 -04:00
|
|
|
# scheme allows the Unpickler memo to be implemented as a plain (but
|
2003-01-27 17:22:10 -04:00
|
|
|
# growable) array, indexed by memo key.
|
2003-01-29 13:58:45 -04:00
|
|
|
if self.fast:
|
|
|
|
return
|
2003-01-30 02:37:41 -04:00
|
|
|
assert id(obj) not in self.memo
|
2003-01-24 15:29:52 -04:00
|
|
|
memo_len = len(self.memo)
|
|
|
|
self.write(self.put(memo_len))
|
2003-01-27 21:00:38 -04:00
|
|
|
self.memo[id(obj)] = memo_len, obj
|
2003-01-24 15:29:52 -04:00
|
|
|
|
2003-01-27 17:25:41 -04:00
|
|
|
# Return a PUT (BINPUT, LONG_BINPUT) opcode string, with argument i.
|
2003-01-27 23:03:08 -04:00
|
|
|
def put(self, i, pack=struct.pack):
|
2001-04-09 23:48:53 -03:00
|
|
|
if self.bin:
|
|
|
|
if i < 256:
|
2007-05-04 16:56:22 -03:00
|
|
|
return BINPUT + bytes([i])
|
2003-01-27 23:03:08 -04:00
|
|
|
else:
|
|
|
|
return LONG_BINPUT + pack("<i", i)
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2007-05-04 16:56:22 -03:00
|
|
|
return PUT + bytes(repr(i)) + b'\n'
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-27 17:25:41 -04:00
|
|
|
# Return a GET (BINGET, LONG_BINGET) opcode string, with argument i.
|
2003-01-27 23:03:08 -04:00
|
|
|
def get(self, i, pack=struct.pack):
|
2001-04-09 23:48:53 -03:00
|
|
|
if self.bin:
|
|
|
|
if i < 256:
|
2007-05-04 16:56:22 -03:00
|
|
|
return BINGET + bytes([i])
|
2003-01-27 23:03:08 -04:00
|
|
|
else:
|
|
|
|
return LONG_BINGET + pack("<i", i)
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2007-05-04 16:56:22 -03:00
|
|
|
return GET + bytes(repr(i)) + b'\n'
|
2001-01-14 20:50:52 -04:00
|
|
|
|
2003-01-28 18:01:16 -04:00
|
|
|
def save(self, obj):
|
2003-01-28 12:34:19 -04:00
|
|
|
# Check for persistent id (defined by a subclass)
|
2003-01-28 11:10:22 -04:00
|
|
|
pid = self.persistent_id(obj)
|
2003-01-28 12:34:19 -04:00
|
|
|
if pid:
|
2002-11-13 18:01:27 -04:00
|
|
|
self.save_pers(pid)
|
|
|
|
return
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Check the memo
|
|
|
|
x = self.memo.get(id(obj))
|
|
|
|
if x:
|
|
|
|
self.write(self.get(x[0]))
|
1997-04-09 14:32:51 -03:00
|
|
|
return
|
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Check the type dispatch table
|
2003-01-28 11:10:22 -04:00
|
|
|
t = type(obj)
|
2003-01-28 12:34:19 -04:00
|
|
|
f = self.dispatch.get(t)
|
|
|
|
if f:
|
|
|
|
f(self, obj) # Call unbound method with explicit self
|
2003-01-27 20:48:09 -04:00
|
|
|
return
|
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Check for a class with a custom metaclass; treat as regular class
|
2003-01-27 20:48:09 -04:00
|
|
|
try:
|
2007-06-07 20:15:56 -03:00
|
|
|
issc = issubclass(t, type)
|
2003-01-28 12:34:19 -04:00
|
|
|
except TypeError: # t is not a class (old Boost; see SF #502085)
|
2003-01-27 20:48:09 -04:00
|
|
|
issc = 0
|
|
|
|
if issc:
|
2003-01-28 11:10:22 -04:00
|
|
|
self.save_global(obj)
|
2003-01-27 20:48:09 -04:00
|
|
|
return
|
2001-12-19 12:55:02 -04:00
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Check copy_reg.dispatch_table
|
|
|
|
reduce = dispatch_table.get(t)
|
2003-02-18 18:05:12 -04:00
|
|
|
if reduce:
|
|
|
|
rv = reduce(obj)
|
|
|
|
else:
|
|
|
|
# Check for a __reduce_ex__ method, fall back to __reduce__
|
|
|
|
reduce = getattr(obj, "__reduce_ex__", None)
|
|
|
|
if reduce:
|
|
|
|
rv = reduce(self.proto)
|
|
|
|
else:
|
|
|
|
reduce = getattr(obj, "__reduce__", None)
|
|
|
|
if reduce:
|
|
|
|
rv = reduce()
|
|
|
|
else:
|
|
|
|
raise PicklingError("Can't pickle %r object: %r" %
|
|
|
|
(t.__name__, obj))
|
2003-01-28 12:34:19 -04:00
|
|
|
|
|
|
|
# Check for string returned by reduce(), meaning "save as global"
|
2007-05-04 17:30:19 -03:00
|
|
|
if isinstance(rv, basestring):
|
2003-01-28 12:34:19 -04:00
|
|
|
self.save_global(obj, rv)
|
2003-01-27 20:48:09 -04:00
|
|
|
return
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Assert that reduce() returned a tuple
|
2007-06-07 20:15:56 -03:00
|
|
|
if not isinstance(rv, tuple):
|
2003-01-28 12:34:19 -04:00
|
|
|
raise PicklingError("%s must return string or tuple" % reduce)
|
2001-01-14 20:50:52 -04:00
|
|
|
|
2003-01-31 14:53:21 -04:00
|
|
|
# Assert that it returned an appropriately sized tuple
|
2003-01-28 12:34:19 -04:00
|
|
|
l = len(rv)
|
2003-01-31 14:53:21 -04:00
|
|
|
if not (2 <= l <= 5):
|
2003-01-28 12:34:19 -04:00
|
|
|
raise PicklingError("Tuple returned by %s must have "
|
2003-01-31 14:53:21 -04:00
|
|
|
"two to five elements" % reduce)
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Save the reduce() output and finally memoize the object
|
2003-01-31 14:53:21 -04:00
|
|
|
self.save_reduce(obj=obj, *rv)
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def persistent_id(self, obj):
|
2003-01-28 12:34:19 -04:00
|
|
|
# This exists so a subclass can override it
|
1997-04-09 14:32:51 -03:00
|
|
|
return None
|
|
|
|
|
|
|
|
def save_pers(self, pid):
|
2003-01-28 12:34:19 -04:00
|
|
|
# Save a persistent id reference
|
2003-01-27 21:03:10 -04:00
|
|
|
if self.bin:
|
2002-11-13 18:01:27 -04:00
|
|
|
self.save(pid)
|
1997-04-09 14:32:51 -03:00
|
|
|
self.write(BINPERSID)
|
2003-01-27 21:03:10 -04:00
|
|
|
else:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(PERSID + bytes(str(pid)) + b'\n')
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-31 14:53:21 -04:00
|
|
|
def save_reduce(self, func, args, state=None,
|
|
|
|
listitems=None, dictitems=None, obj=None):
|
2003-06-29 13:59:59 -03:00
|
|
|
# This API is called by some subclasses
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Assert that args is a tuple or None
|
2007-06-07 20:15:56 -03:00
|
|
|
if not isinstance(args, tuple):
|
2004-12-07 03:05:57 -04:00
|
|
|
raise PicklingError("args from reduce() should be a tuple")
|
2003-01-27 16:16:36 -04:00
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Assert that func is callable
|
Merged revisions 55407-55513 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
................
r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line
Implements class decorators, PEP 3129.
................
r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines
obsubmit.
................
r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines
Fix bug in test_inspect. (I presume this is how it should be fixed;
Jack Diedrich, please verify.)
................
r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines
Remove the imageop module. With imgfile already removed in Python 3.0 and
rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus
third-party libraries perform the same function much better.
................
r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines
Merged revisions 55324-55467 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines
HTML-escape the plain traceback in cgitb's HTML output, to prevent
the traceback inadvertently or maliciously closing the comment and
injecting HTML into the error page.
........
r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines
Port rev 55353 from Guido:
Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC()
fails.
Will backport.
........
r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line
Mention removal of some directories for obsolete platforms
........
r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines
Change the maintainer of the BeOS port.
........
r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines
Bug #1719995: don't use deprecated method in sets example.
........
r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines
Fix bug in marshal where bad data would cause a segfault due to
lack of an infinite recursion check.
Contributed by Damien Miller at Google.
........
r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines
Remove the gopherlib module. It has been raising a DeprecationWarning since
Python 2.5.
Also remove gopher support from urllib/urllib2. As both imported gopherlib the
usage of the support would have raised a DeprecationWarning.
........
r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line
calendar.py gets no benefit from xrange() instead of range()
........
r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines
Complete deprecation of BaseException.message. Some subclasses were directly
accessing the message attribute instead of using the descriptor.
........
r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines
Reduce the max stack depth to see if this fixes the segfaults on
Windows and some other boxes. If this is successful, this rev should
be backported. I'm not sure how close to the limit we should push this.
........
r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines
Set the depth to something very small to try to determine if the
crashes on Windows are really due to the stack size or possibly
some other problem.
........
r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines
Last try for tweaking the max stack depth. 5000 was the original value,
4000 didn't work either. 1000 does work on Windows. If 2000 works,
that will hopefully be a reasonable balance.
........
r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
........
r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line
Verify neither dumps or loads overflow the stack and segfault.
........
r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line
Backport PEP 3110's new 'except' syntax to 2.6.
........
r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line
Improvements to NamedTuple's implementation, tests, and documentation
........
r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line
Fix beginner mistake -- don't mix spaces and tabs.
........
r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line
Clear data so random memory does not get freed. Will backport.
........
r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines
Whoops, need to pay attention to those test failures.
Move the clear to *before* the first use, not after.
........
r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line
Give some clue as to what happened if the test fails.
........
r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines
Fix docstring for add_package in site.py.
........
r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines
Remove the rgbimg module. It has been deprecated since Python 2.5.
........
r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line
Fix typo in example (should be backported, but my maintenance branch is woefully out of date)
........
................
r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines
Remove imageop from the Windows build process.
................
r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line
Remove callable() builtin
................
r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines
Merged revisions 55468-55505 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line
rotor is long gone.
........
r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line
Update directories/files at the top-level.
........
r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines
Try to remove rgbimg from Windows builds.
........
r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines
Remove the macfs module. This led to the deprecation of macostools.touched();
it completely relied on macfs and is a no-op on OS X according to code
comments.
........
r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines
Move imgfile import to the global namespace to trigger an import error ASAP to
prevent creation of a test file.
........
r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines
Cause posixfile to raise a DeprecationWarning. Documented as deprecated since
Ptyhon 1.5.
........
r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line
Note removed modules
........
r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines
Add Alexandre Vassalotti.
........
r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines
fix against r55474 [Remove the macfs module]
Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex.
........
r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line
Replace assertion with straight error-checking.
........
r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line
Allow all alphanumeric and underscores in type and field names.
........
r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines
Added timeout support to HTTPSConnection, through the
socket.create_connection function. Also added a small
test for this, and updated NEWS file.
........
r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines
Patch #1686487: you can now pass any mapping after '**' in function calls.
........
r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line
Document new params to HTTPSConnection
........
r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS
........
r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS implicitly
........
................
2007-05-22 15:11:13 -03:00
|
|
|
if not hasattr(func, '__call__'):
|
2003-01-28 12:34:19 -04:00
|
|
|
raise PicklingError("func from reduce should be callable")
|
|
|
|
|
|
|
|
save = self.save
|
|
|
|
write = self.write
|
|
|
|
|
2003-01-31 12:51:45 -04:00
|
|
|
# Protocol 2 special case: if func's name is __newobj__, use NEWOBJ
|
|
|
|
if self.proto >= 2 and getattr(func, "__name__", "") == "__newobj__":
|
|
|
|
# A __reduce__ implementation can direct protocol 2 to
|
|
|
|
# use the more efficient NEWOBJ opcode, while still
|
|
|
|
# allowing protocol 0 and 1 to work normally. For this to
|
|
|
|
# work, the function returned by __reduce__ should be
|
|
|
|
# called __newobj__, and its first argument should be a
|
|
|
|
# new-style class. The implementation for __newobj__
|
|
|
|
# should be as follows, although pickle has no way to
|
|
|
|
# verify this:
|
|
|
|
#
|
|
|
|
# def __newobj__(cls, *args):
|
|
|
|
# return cls.__new__(cls, *args)
|
|
|
|
#
|
|
|
|
# Protocols 0 and 1 will pickle a reference to __newobj__,
|
|
|
|
# while protocol 2 (and above) will pickle a reference to
|
|
|
|
# cls, the remaining args tuple, and the NEWOBJ code,
|
|
|
|
# which calls cls.__new__(cls, *args) at unpickling time
|
|
|
|
# (see load_newobj below). If __reduce__ returns a
|
|
|
|
# three-tuple, the state from the third tuple item will be
|
|
|
|
# pickled regardless of the protocol, calling __setstate__
|
|
|
|
# at unpickling time (see load_build below).
|
|
|
|
#
|
|
|
|
# Note that no standard __newobj__ implementation exists;
|
|
|
|
# you have to provide your own. This is to enforce
|
|
|
|
# compatibility with Python 2.2 (pickles written using
|
|
|
|
# protocol 0 or 1 in Python 2.3 should be unpicklable by
|
|
|
|
# Python 2.2).
|
|
|
|
cls = args[0]
|
|
|
|
if not hasattr(cls, "__new__"):
|
|
|
|
raise PicklingError(
|
|
|
|
"args[0] from __newobj__ args has no __new__")
|
2003-01-31 13:17:49 -04:00
|
|
|
if obj is not None and cls is not obj.__class__:
|
|
|
|
raise PicklingError(
|
|
|
|
"args[0] from __newobj__ args has the wrong class")
|
2003-01-31 12:51:45 -04:00
|
|
|
args = args[1:]
|
|
|
|
save(cls)
|
|
|
|
save(args)
|
|
|
|
write(NEWOBJ)
|
|
|
|
else:
|
|
|
|
save(func)
|
|
|
|
save(args)
|
|
|
|
write(REDUCE)
|
2001-01-14 20:50:52 -04:00
|
|
|
|
2003-01-31 13:17:49 -04:00
|
|
|
if obj is not None:
|
|
|
|
self.memoize(obj)
|
|
|
|
|
2003-01-31 14:53:21 -04:00
|
|
|
# More new special cases (that work with older protocols as
|
|
|
|
# well): when __reduce__ returns a tuple with 4 or 5 items,
|
|
|
|
# the 4th and 5th item should be iterators that provide list
|
|
|
|
# items and dict items (as (key, value) tuples), or None.
|
|
|
|
|
|
|
|
if listitems is not None:
|
|
|
|
self._batch_appends(listitems)
|
|
|
|
|
|
|
|
if dictitems is not None:
|
|
|
|
self._batch_setitems(dictitems)
|
|
|
|
|
2001-04-09 23:48:53 -03:00
|
|
|
if state is not None:
|
1997-04-09 14:32:51 -03:00
|
|
|
save(state)
|
|
|
|
write(BUILD)
|
|
|
|
|
2003-01-28 12:34:19 -04:00
|
|
|
# Methods below this point are dispatched through the dispatch table
|
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
dispatch = {}
|
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_none(self, obj):
|
1997-04-09 14:32:51 -03:00
|
|
|
self.write(NONE)
|
2007-06-07 20:15:56 -03:00
|
|
|
dispatch[type(None)] = save_none
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_bool(self, obj):
|
2003-01-28 00:25:27 -04:00
|
|
|
if self.proto >= 2:
|
2003-01-28 11:10:22 -04:00
|
|
|
self.write(obj and NEWTRUE or NEWFALSE)
|
2003-01-28 00:25:27 -04:00
|
|
|
else:
|
2003-01-28 11:10:22 -04:00
|
|
|
self.write(obj and TRUE or FALSE)
|
2002-04-03 18:41:51 -04:00
|
|
|
dispatch[bool] = save_bool
|
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_int(self, obj, pack=struct.pack):
|
2001-04-09 23:48:53 -03:00
|
|
|
if self.bin:
|
2001-04-10 02:02:52 -03:00
|
|
|
# If the int is small enough to fit in a signed 4-byte 2's-comp
|
|
|
|
# format, we can store it more efficiently than the general
|
|
|
|
# case.
|
2003-01-27 23:03:08 -04:00
|
|
|
# First one- and two-byte unsigned ints:
|
2003-01-28 11:10:22 -04:00
|
|
|
if obj >= 0:
|
|
|
|
if obj <= 0xff:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(BININT1 + bytes([obj]))
|
2003-01-27 23:03:08 -04:00
|
|
|
return
|
2003-01-28 11:10:22 -04:00
|
|
|
if obj <= 0xffff:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(BININT2 + bytes([obj&0xff, obj>>8]))
|
2003-01-27 23:03:08 -04:00
|
|
|
return
|
|
|
|
# Next check for 4-byte signed ints:
|
2003-01-28 11:10:22 -04:00
|
|
|
high_bits = obj >> 31 # note that Python shift sign-extends
|
2003-01-27 23:41:54 -04:00
|
|
|
if high_bits == 0 or high_bits == -1:
|
2001-04-10 02:02:52 -03:00
|
|
|
# All high bits are copies of bit 2**31, so the value
|
|
|
|
# fits in a 4-byte signed int.
|
2003-01-28 11:10:22 -04:00
|
|
|
self.write(BININT + pack("<i", obj))
|
1997-04-09 14:32:51 -03:00
|
|
|
return
|
2001-04-10 02:02:52 -03:00
|
|
|
# Text pickle, or int too big to fit in signed 4-byte format.
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(INT + bytes(repr(obj)) + b'\n')
|
2007-01-13 23:31:43 -04:00
|
|
|
# XXX save_int is merged into save_long
|
2007-06-07 20:15:56 -03:00
|
|
|
# dispatch[int] = save_int
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_long(self, obj, pack=struct.pack):
|
2007-01-13 23:31:43 -04:00
|
|
|
if self.bin:
|
|
|
|
# If the int is small enough to fit in a signed 4-byte 2's-comp
|
|
|
|
# format, we can store it more efficiently than the general
|
|
|
|
# case.
|
|
|
|
# First one- and two-byte unsigned ints:
|
|
|
|
if obj >= 0:
|
|
|
|
if obj <= 0xff:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(BININT1 + bytes([obj]))
|
2007-01-13 23:31:43 -04:00
|
|
|
return
|
|
|
|
if obj <= 0xffff:
|
2007-05-08 18:26:54 -03:00
|
|
|
self.write(BININT2 + bytes([obj&0xff, obj>>8]))
|
2007-01-13 23:31:43 -04:00
|
|
|
return
|
|
|
|
# Next check for 4-byte signed ints:
|
|
|
|
high_bits = obj >> 31 # note that Python shift sign-extends
|
|
|
|
if high_bits == 0 or high_bits == -1:
|
|
|
|
# All high bits are copies of bit 2**31, so the value
|
|
|
|
# fits in a 4-byte signed int.
|
|
|
|
self.write(BININT + pack("<i", obj))
|
|
|
|
return
|
2003-01-27 23:49:52 -04:00
|
|
|
if self.proto >= 2:
|
2007-05-04 16:56:22 -03:00
|
|
|
encoded = encode_long(obj)
|
|
|
|
n = len(encoded)
|
2003-01-27 23:49:52 -04:00
|
|
|
if n < 256:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(LONG1 + bytes([n]) + encoded)
|
2003-01-27 23:49:52 -04:00
|
|
|
else:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(LONG4 + pack("<i", n) + encoded)
|
cPickle.c: Full support for the new LONG1 and LONG4. Added comments.
Assorted code cleanups; e.g., sizeof(char) is 1 by definition, so there's
no need to do things like multiply by sizeof(char) in hairy malloc
arguments. Fixed an undetected-overflow bug in readline_file().
longobject.c: Fixed a really stupid bug in the new _PyLong_NumBits.
pickle.py: Fixed stupid bug in save_long(): When proto is 2, it
wrote LONG1 or LONG4, but forgot to return then -- it went on to
append the proto 1 LONG opcode too.
Fixed equally stupid cancelling bugs in load_long1() and
load_long4(): they *returned* the unpickled long instead of pushing
it on the stack. The return values were ignored. Tests passed
before only because save_long() pickled the long twice.
Fixed bugs in encode_long().
Noted that decode_long() is quadratic-time despite our hopes,
because long(string, 16) is still quadratic-time in len(string).
It's hex() that's linear-time. I don't know a way to make decode_long()
linear-time in Python, short of maybe transforming the 256's-complement
bytes into marshal's funky internal format, and letting marshal decode
that. It would be more valuable to make long(string, 16) linear time.
pickletester.py: Added a global "protocols" vector so tests can try
all the protocols in a sane way. Changed test_ints() and test_unicode()
to do so. Added a new test_long(), but the tail end of it is disabled
because it "takes forever" under pickle.py (but runs very quickly under
cPickle: cPickle proto 2 for longs is linear-time).
2003-02-01 22:57:53 -04:00
|
|
|
return
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(LONG + bytes(repr(obj)) + b'\n')
|
2007-06-07 20:15:56 -03:00
|
|
|
dispatch[int] = save_long
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_float(self, obj, pack=struct.pack):
|
1998-10-22 17:15:36 -03:00
|
|
|
if self.bin:
|
2003-01-28 11:10:22 -04:00
|
|
|
self.write(BINFLOAT + pack('>d', obj))
|
1998-10-22 17:15:36 -03:00
|
|
|
else:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(FLOAT + bytes(repr(obj)) + b'\n')
|
2007-06-07 20:15:56 -03:00
|
|
|
dispatch[float] = save_float
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_string(self, obj, pack=struct.pack):
|
2001-04-09 23:48:53 -03:00
|
|
|
if self.bin:
|
2003-01-28 11:10:22 -04:00
|
|
|
n = len(obj)
|
2003-01-27 17:15:36 -04:00
|
|
|
if n < 256:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(SHORT_BINSTRING + bytes([n]) + bytes(obj))
|
1997-04-09 14:32:51 -03:00
|
|
|
else:
|
2007-05-04 16:56:22 -03:00
|
|
|
self.write(BINSTRING + pack("<i", n) + bytes(obj))
|
1997-04-09 14:32:51 -03:00
|
|
|
else:
|
2007-06-15 00:35:38 -03:00
|
|
|
# Strip leading 's' due to repr() of str8() returning s'...'
|
|
|
|
self.write(STRING + bytes(repr(obj).lstrip("s")) + b'\n')
|
2003-01-28 11:10:22 -04:00
|
|
|
self.memoize(obj)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[str8] = save_string
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_unicode(self, obj, pack=struct.pack):
|
2001-04-09 23:48:53 -03:00
|
|
|
if self.bin:
|
2007-05-04 16:56:22 -03:00
|
|
|
encoded = obj.encode('utf-8')
|
|
|
|
n = len(encoded)
|
|
|
|
self.write(BINUNICODE + pack("<i", n) + encoded)
|
2000-03-10 19:20:09 -04:00
|
|
|
else:
|
2003-01-28 11:10:22 -04:00
|
|
|
obj = obj.replace("\\", "\\u005c")
|
|
|
|
obj = obj.replace("\n", "\\u000a")
|
2007-05-04 17:30:19 -03:00
|
|
|
self.write(UNICODE + bytes(obj.encode('raw-unicode-escape')) +
|
|
|
|
b'\n')
|
2003-01-28 11:10:22 -04:00
|
|
|
self.memoize(obj)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[str] = save_unicode
|
2001-02-09 16:06:00 -04:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_tuple(self, obj):
|
1997-04-09 14:32:51 -03:00
|
|
|
write = self.write
|
2003-01-28 00:14:51 -04:00
|
|
|
proto = self.proto
|
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
n = len(obj)
|
2003-02-02 16:29:39 -04:00
|
|
|
if n == 0:
|
|
|
|
if proto:
|
|
|
|
write(EMPTY_TUPLE)
|
|
|
|
else:
|
|
|
|
write(MARK + TUPLE)
|
2003-01-28 01:48:29 -04:00
|
|
|
return
|
|
|
|
|
|
|
|
save = self.save
|
|
|
|
memo = self.memo
|
|
|
|
if n <= 3 and proto >= 2:
|
2003-01-28 11:10:22 -04:00
|
|
|
for element in obj:
|
2003-01-28 01:48:29 -04:00
|
|
|
save(element)
|
|
|
|
# Subtle. Same as in the big comment below.
|
2003-01-28 11:10:22 -04:00
|
|
|
if id(obj) in memo:
|
|
|
|
get = self.get(memo[id(obj)][0])
|
2003-01-28 01:48:29 -04:00
|
|
|
write(POP * n + get)
|
|
|
|
else:
|
|
|
|
write(_tuplesize2code[n])
|
2003-01-28 11:10:22 -04:00
|
|
|
self.memoize(obj)
|
2003-01-28 01:48:29 -04:00
|
|
|
return
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-02-02 16:29:39 -04:00
|
|
|
# proto 0 or proto 1 and tuple isn't empty, or proto > 1 and tuple
|
2003-01-28 01:34:53 -04:00
|
|
|
# has more than 3 elements.
|
1997-04-09 14:32:51 -03:00
|
|
|
write(MARK)
|
2003-01-28 11:10:22 -04:00
|
|
|
for element in obj:
|
1997-04-09 14:32:51 -03:00
|
|
|
save(element)
|
|
|
|
|
2003-02-02 16:29:39 -04:00
|
|
|
if id(obj) in memo:
|
2003-01-27 22:09:55 -04:00
|
|
|
# Subtle. d was not in memo when we entered save_tuple(), so
|
|
|
|
# the process of saving the tuple's elements must have saved
|
|
|
|
# the tuple itself: the tuple is recursive. The proper action
|
|
|
|
# now is to throw away everything we put on the stack, and
|
|
|
|
# simply GET the tuple (it's already constructed). This check
|
|
|
|
# could have been done in the "for element" loop instead, but
|
|
|
|
# recursive tuples are a rare thing.
|
2003-01-28 11:10:22 -04:00
|
|
|
get = self.get(memo[id(obj)][0])
|
2003-01-28 00:14:51 -04:00
|
|
|
if proto:
|
2003-01-27 22:09:55 -04:00
|
|
|
write(POP_MARK + get)
|
|
|
|
else: # proto 0 -- POP_MARK not available
|
2003-01-28 01:48:29 -04:00
|
|
|
write(POP * (n+1) + get)
|
1997-04-09 14:32:51 -03:00
|
|
|
return
|
|
|
|
|
2003-02-02 16:29:39 -04:00
|
|
|
# No recursion.
|
2003-01-27 21:00:38 -04:00
|
|
|
self.write(TUPLE)
|
2003-02-02 16:29:39 -04:00
|
|
|
self.memoize(obj)
|
2003-01-24 15:29:52 -04:00
|
|
|
|
2007-06-07 20:15:56 -03:00
|
|
|
dispatch[tuple] = save_tuple
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 12:58:41 -04:00
|
|
|
# save_empty_tuple() isn't used by anything in Python 2.3. However, I
|
|
|
|
# found a Pickler subclass in Zope3 that calls it, so it's not harmless
|
|
|
|
# to remove it.
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_empty_tuple(self, obj):
|
1997-04-09 14:32:51 -03:00
|
|
|
self.write(EMPTY_TUPLE)
|
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_list(self, obj):
|
1997-04-09 14:32:51 -03:00
|
|
|
write = self.write
|
|
|
|
|
2001-04-09 23:48:53 -03:00
|
|
|
if self.bin:
|
1997-04-09 14:32:51 -03:00
|
|
|
write(EMPTY_LIST)
|
2003-01-31 14:53:21 -04:00
|
|
|
else: # proto 0 -- can't use EMPTY_LIST
|
|
|
|
write(MARK + LIST)
|
|
|
|
|
|
|
|
self.memoize(obj)
|
|
|
|
self._batch_appends(iter(obj))
|
|
|
|
|
2007-06-07 20:15:56 -03:00
|
|
|
dispatch[list] = save_list
|
2003-01-31 14:53:21 -04:00
|
|
|
|
|
|
|
_BATCHSIZE = 1000
|
|
|
|
|
|
|
|
def _batch_appends(self, items):
|
|
|
|
# Helper to batch up APPENDS sequences
|
|
|
|
save = self.save
|
|
|
|
write = self.write
|
|
|
|
|
|
|
|
if not self.bin:
|
|
|
|
for x in items:
|
|
|
|
save(x)
|
|
|
|
write(APPEND)
|
|
|
|
return
|
|
|
|
|
2007-05-07 19:24:25 -03:00
|
|
|
r = range(self._BATCHSIZE)
|
2003-01-31 14:53:21 -04:00
|
|
|
while items is not None:
|
|
|
|
tmp = []
|
|
|
|
for i in r:
|
|
|
|
try:
|
2007-04-21 12:47:16 -03:00
|
|
|
x = next(items)
|
2003-02-06 18:57:00 -04:00
|
|
|
tmp.append(x)
|
2003-01-31 14:53:21 -04:00
|
|
|
except StopIteration:
|
|
|
|
items = None
|
|
|
|
break
|
|
|
|
n = len(tmp)
|
2003-01-27 21:15:46 -04:00
|
|
|
if n > 1:
|
|
|
|
write(MARK)
|
2003-01-31 14:53:21 -04:00
|
|
|
for x in tmp:
|
|
|
|
save(x)
|
2003-01-27 21:15:46 -04:00
|
|
|
write(APPENDS)
|
|
|
|
elif n:
|
2003-01-31 14:53:21 -04:00
|
|
|
save(tmp[0])
|
2003-01-27 21:15:46 -04:00
|
|
|
write(APPEND)
|
2003-01-31 14:53:21 -04:00
|
|
|
# else tmp is empty, and we're done
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def save_dict(self, obj):
|
1997-04-09 14:32:51 -03:00
|
|
|
write = self.write
|
|
|
|
|
2001-04-09 23:48:53 -03:00
|
|
|
if self.bin:
|
1997-04-09 14:32:51 -03:00
|
|
|
write(EMPTY_DICT)
|
2003-01-31 14:53:21 -04:00
|
|
|
else: # proto 0 -- can't use EMPTY_DICT
|
2003-01-27 21:34:43 -04:00
|
|
|
write(MARK + DICT)
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-31 14:53:21 -04:00
|
|
|
self.memoize(obj)
|
2007-02-11 02:12:03 -04:00
|
|
|
self._batch_setitems(iter(obj.items()))
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2007-06-07 20:15:56 -03:00
|
|
|
dispatch[dict] = save_dict
|
|
|
|
if PyStringMap is not None:
|
1998-05-27 19:38:22 -03:00
|
|
|
dispatch[PyStringMap] = save_dict
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-31 14:53:21 -04:00
|
|
|
def _batch_setitems(self, items):
|
|
|
|
# Helper to batch up SETITEMS sequences; proto >= 1 only
|
|
|
|
save = self.save
|
|
|
|
write = self.write
|
|
|
|
|
|
|
|
if not self.bin:
|
|
|
|
for k, v in items:
|
|
|
|
save(k)
|
|
|
|
save(v)
|
|
|
|
write(SETITEM)
|
|
|
|
return
|
|
|
|
|
2007-05-07 19:24:25 -03:00
|
|
|
r = range(self._BATCHSIZE)
|
2003-01-31 14:53:21 -04:00
|
|
|
while items is not None:
|
|
|
|
tmp = []
|
|
|
|
for i in r:
|
|
|
|
try:
|
2007-04-21 12:47:16 -03:00
|
|
|
tmp.append(next(items))
|
2003-01-31 14:53:21 -04:00
|
|
|
except StopIteration:
|
|
|
|
items = None
|
|
|
|
break
|
|
|
|
n = len(tmp)
|
|
|
|
if n > 1:
|
|
|
|
write(MARK)
|
|
|
|
for k, v in tmp:
|
|
|
|
save(k)
|
|
|
|
save(v)
|
|
|
|
write(SETITEMS)
|
|
|
|
elif n:
|
|
|
|
k, v = tmp[0]
|
|
|
|
save(k)
|
|
|
|
save(v)
|
|
|
|
write(SETITEM)
|
|
|
|
# else tmp is empty, and we're done
|
|
|
|
|
2003-01-29 02:14:11 -04:00
|
|
|
def save_global(self, obj, name=None, pack=struct.pack):
|
1997-04-09 14:32:51 -03:00
|
|
|
write = self.write
|
|
|
|
memo = self.memo
|
|
|
|
|
2001-04-09 23:48:53 -03:00
|
|
|
if name is None:
|
2003-01-28 11:10:22 -04:00
|
|
|
name = obj.__name__
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-31 14:33:18 -04:00
|
|
|
module = getattr(obj, "__module__", None)
|
|
|
|
if module is None:
|
2003-01-28 11:10:22 -04:00
|
|
|
module = whichmodule(obj, name)
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2001-08-17 15:49:52 -03:00
|
|
|
try:
|
|
|
|
__import__(module)
|
|
|
|
mod = sys.modules[module]
|
|
|
|
klass = getattr(mod, name)
|
|
|
|
except (ImportError, KeyError, AttributeError):
|
|
|
|
raise PicklingError(
|
|
|
|
"Can't pickle %r: it's not found as %s.%s" %
|
2003-01-28 11:10:22 -04:00
|
|
|
(obj, module, name))
|
2001-08-17 15:49:52 -03:00
|
|
|
else:
|
2003-01-28 11:10:22 -04:00
|
|
|
if klass is not obj:
|
2001-08-17 15:49:52 -03:00
|
|
|
raise PicklingError(
|
|
|
|
"Can't pickle %r: it's not the same object as %s.%s" %
|
2003-01-28 11:10:22 -04:00
|
|
|
(obj, module, name))
|
2001-08-17 15:49:52 -03:00
|
|
|
|
2003-01-29 02:14:11 -04:00
|
|
|
if self.proto >= 2:
|
2003-02-03 21:54:49 -04:00
|
|
|
code = _extension_registry.get((module, name))
|
2003-01-29 02:14:11 -04:00
|
|
|
if code:
|
|
|
|
assert code > 0
|
|
|
|
if code <= 0xff:
|
2007-05-04 16:56:22 -03:00
|
|
|
write(EXT1 + bytes([code]))
|
2003-01-29 02:14:11 -04:00
|
|
|
elif code <= 0xffff:
|
2007-05-04 16:56:22 -03:00
|
|
|
write(EXT2 + bytes([code&0xff, code>>8]))
|
2003-01-29 02:14:11 -04:00
|
|
|
else:
|
|
|
|
write(EXT4 + pack("<i", code))
|
|
|
|
return
|
|
|
|
|
2007-05-04 16:56:22 -03:00
|
|
|
write(GLOBAL + bytes(module) + b'\n' + bytes(name) + b'\n')
|
2003-01-28 11:10:22 -04:00
|
|
|
self.memoize(obj)
|
2003-01-27 23:51:36 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
dispatch[FunctionType] = save_global
|
|
|
|
dispatch[BuiltinFunctionType] = save_global
|
2007-06-07 20:15:56 -03:00
|
|
|
dispatch[type] = save_global
|
1995-03-14 11:09:05 -04:00
|
|
|
|
2003-01-28 11:19:53 -04:00
|
|
|
# Pickling helpers
|
1995-01-09 20:31:14 -04:00
|
|
|
|
1997-09-02 21:23:54 -03:00
|
|
|
def _keep_alive(x, memo):
|
|
|
|
"""Keeps a reference to the object x in the memo.
|
|
|
|
|
|
|
|
Because we remember objects by their id, we have
|
|
|
|
to assure that possibly temporary objects are kept
|
|
|
|
alive by referencing them.
|
|
|
|
We store a reference at the id of the memo, which should
|
|
|
|
normally not be used unless someone tries to deepcopy
|
|
|
|
the memo itself...
|
|
|
|
"""
|
|
|
|
try:
|
1998-03-26 17:13:24 -04:00
|
|
|
memo[id(memo)].append(x)
|
1997-09-02 21:23:54 -03:00
|
|
|
except KeyError:
|
1998-03-26 17:13:24 -04:00
|
|
|
# aha, this is the first one :-)
|
|
|
|
memo[id(memo)]=[x]
|
1997-09-02 21:23:54 -03:00
|
|
|
|
|
|
|
|
2003-01-28 20:56:17 -04:00
|
|
|
# A cache for whichmodule(), mapping a function object to the name of
|
|
|
|
# the module in which the function was found.
|
|
|
|
|
2002-09-19 20:00:12 -03:00
|
|
|
classmap = {} # called classmap for backwards compatibility
|
1995-01-09 20:31:14 -04:00
|
|
|
|
2002-09-19 20:00:12 -03:00
|
|
|
def whichmodule(func, funcname):
|
|
|
|
"""Figure out the module in which a function occurs.
|
1995-01-09 20:31:14 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
Search sys.modules for the module.
|
|
|
|
Cache in classmap.
|
|
|
|
Return a module name.
|
2003-01-28 20:56:17 -04:00
|
|
|
If the function cannot be found, return "__main__".
|
1997-04-09 14:32:51 -03:00
|
|
|
"""
|
2003-01-31 14:33:18 -04:00
|
|
|
# Python functions should always get an __module__ from their globals.
|
|
|
|
mod = getattr(func, "__module__", None)
|
|
|
|
if mod is not None:
|
|
|
|
return mod
|
2002-09-19 20:00:12 -03:00
|
|
|
if func in classmap:
|
|
|
|
return classmap[func]
|
1995-01-09 20:31:14 -04:00
|
|
|
|
2007-02-26 03:07:02 -04:00
|
|
|
for name, module in list(sys.modules.items()):
|
2002-09-19 20:00:12 -03:00
|
|
|
if module is None:
|
2002-09-19 19:57:26 -03:00
|
|
|
continue # skip dummy package entries
|
2003-02-06 12:23:01 -04:00
|
|
|
if name != '__main__' and getattr(module, funcname, None) is func:
|
1997-04-09 14:32:51 -03:00
|
|
|
break
|
|
|
|
else:
|
|
|
|
name = '__main__'
|
2002-09-19 20:00:12 -03:00
|
|
|
classmap[func] = name
|
1997-04-09 14:32:51 -03:00
|
|
|
return name
|
1995-01-09 20:31:14 -04:00
|
|
|
|
|
|
|
|
2003-01-28 11:19:53 -04:00
|
|
|
# Unpickling machinery
|
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
class Unpickler:
|
1995-01-09 20:31:14 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def __init__(self, file):
|
2007-05-04 16:56:22 -03:00
|
|
|
"""This takes a binary file for reading a pickle data stream.
|
2002-05-29 13:18:42 -03:00
|
|
|
|
2003-02-01 12:45:06 -04:00
|
|
|
The protocol version of the pickle is detected automatically, so no
|
|
|
|
proto argument is needed.
|
2002-05-29 13:18:42 -03:00
|
|
|
|
|
|
|
The file-like object must have two methods, a read() method that
|
|
|
|
takes an integer argument, and a readline() method that requires no
|
|
|
|
arguments. Both methods should return a string. Thus file-like
|
|
|
|
object can be a file object opened for reading, a StringIO object,
|
|
|
|
or any other custom object that meets this interface.
|
|
|
|
"""
|
2007-05-04 16:56:22 -03:00
|
|
|
try:
|
|
|
|
self.readline = file.readline
|
|
|
|
except AttributeError:
|
|
|
|
self.file = file
|
1997-04-09 14:32:51 -03:00
|
|
|
self.read = file.read
|
|
|
|
self.memo = {}
|
|
|
|
|
2007-05-04 16:56:22 -03:00
|
|
|
def readline(self):
|
|
|
|
# XXX Slow but at least correct
|
|
|
|
b = bytes()
|
|
|
|
while True:
|
|
|
|
c = self.file.read(1)
|
|
|
|
if not c:
|
|
|
|
break
|
|
|
|
b += c
|
|
|
|
if c == b'\n':
|
|
|
|
break
|
|
|
|
return b
|
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load(self):
|
2003-01-28 11:10:22 -04:00
|
|
|
"""Read a pickled object representation from the open file.
|
2002-05-29 13:18:42 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
Return the reconstituted object hierarchy specified in the file.
|
2002-05-29 13:18:42 -03:00
|
|
|
"""
|
2001-11-09 12:15:04 -04:00
|
|
|
self.mark = object() # any new unique object
|
1997-04-09 14:32:51 -03:00
|
|
|
self.stack = []
|
|
|
|
self.append = self.stack.append
|
|
|
|
read = self.read
|
|
|
|
dispatch = self.dispatch
|
|
|
|
try:
|
|
|
|
while 1:
|
|
|
|
key = read(1)
|
2007-05-04 16:56:22 -03:00
|
|
|
if not key:
|
|
|
|
raise EOFError
|
2007-05-08 18:26:54 -03:00
|
|
|
assert isinstance(key, bytes)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[key[0]](self)
|
2007-01-10 12:19:56 -04:00
|
|
|
except _Stop as stopinst:
|
2000-12-13 14:11:56 -04:00
|
|
|
return stopinst.value
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-27 21:41:51 -04:00
|
|
|
# Return largest index k such that self.stack[k] is self.mark.
|
|
|
|
# If the stack doesn't contain a mark, eventually raises IndexError.
|
|
|
|
# This could be sped by maintaining another stack, of indices at which
|
|
|
|
# the mark appears. For that matter, the latter stack would suffice,
|
|
|
|
# and we wouldn't need to push mark objects on self.stack at all.
|
|
|
|
# Doing so is probably a good thing, though, since if the pickle is
|
|
|
|
# corrupt (or hostile) we may get a clue from finding self.mark embedded
|
|
|
|
# in unpickled objects.
|
1997-04-09 14:32:51 -03:00
|
|
|
def marker(self):
|
|
|
|
stack = self.stack
|
|
|
|
mark = self.mark
|
|
|
|
k = len(stack)-1
|
|
|
|
while stack[k] is not mark: k = k-1
|
|
|
|
return k
|
|
|
|
|
|
|
|
dispatch = {}
|
|
|
|
|
2003-01-27 23:49:52 -04:00
|
|
|
def load_proto(self):
|
|
|
|
proto = ord(self.read(1))
|
|
|
|
if not 0 <= proto <= 2:
|
|
|
|
raise ValueError, "unsupported pickle protocol: %d" % proto
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[PROTO[0]] = load_proto
|
2003-01-27 23:49:52 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_persid(self):
|
|
|
|
pid = self.readline()[:-1]
|
|
|
|
self.append(self.persistent_load(pid))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[PERSID[0]] = load_persid
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_binpersid(self):
|
2002-06-30 00:39:14 -03:00
|
|
|
pid = self.stack.pop()
|
1997-04-09 14:32:51 -03:00
|
|
|
self.append(self.persistent_load(pid))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[BINPERSID[0]] = load_binpersid
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_none(self):
|
|
|
|
self.append(None)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[NONE[0]] = load_none
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 00:25:27 -04:00
|
|
|
def load_false(self):
|
|
|
|
self.append(False)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[NEWFALSE[0]] = load_false
|
2003-01-28 00:25:27 -04:00
|
|
|
|
|
|
|
def load_true(self):
|
|
|
|
self.append(True)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[NEWTRUE[0]] = load_true
|
2003-01-28 00:25:27 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_int(self):
|
2001-08-28 19:21:18 -03:00
|
|
|
data = self.readline()
|
2002-04-05 15:30:08 -04:00
|
|
|
if data == FALSE[1:]:
|
|
|
|
val = False
|
|
|
|
elif data == TRUE[1:]:
|
|
|
|
val = True
|
|
|
|
else:
|
|
|
|
try:
|
|
|
|
val = int(data)
|
|
|
|
except ValueError:
|
2007-01-15 12:59:06 -04:00
|
|
|
val = int(data)
|
2002-04-05 15:30:08 -04:00
|
|
|
self.append(val)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[INT[0]] = load_int
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_binint(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
self.append(mloads(b'i' + self.read(4)))
|
|
|
|
dispatch[BININT[0]] = load_binint
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_binint1(self):
|
2003-01-27 17:15:36 -04:00
|
|
|
self.append(ord(self.read(1)))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[BININT1[0]] = load_binint1
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_binint2(self):
|
2007-05-08 18:26:54 -03:00
|
|
|
self.append(mloads(b'i' + self.read(2) + b'\000\000'))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[BININT2[0]] = load_binint2
|
2001-01-14 20:50:52 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_long(self):
|
2007-05-04 17:30:19 -03:00
|
|
|
self.append(int(str(self.readline()[:-1]), 0))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[LONG[0]] = load_long
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-27 23:49:52 -04:00
|
|
|
def load_long1(self):
|
|
|
|
n = ord(self.read(1))
|
2007-05-04 16:56:22 -03:00
|
|
|
data = self.read(n)
|
|
|
|
self.append(decode_long(data))
|
|
|
|
dispatch[LONG1[0]] = load_long1
|
2003-01-27 23:49:52 -04:00
|
|
|
|
|
|
|
def load_long4(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
n = mloads(b'i' + self.read(4))
|
|
|
|
data = self.read(n)
|
|
|
|
self.append(decode_long(data))
|
|
|
|
dispatch[LONG4[0]] = load_long4
|
2003-01-27 23:49:52 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_float(self):
|
2000-12-13 14:11:56 -04:00
|
|
|
self.append(float(self.readline()[:-1]))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[FLOAT[0]] = load_float
|
1997-04-09 14:32:51 -03:00
|
|
|
|
1998-10-22 17:15:36 -03:00
|
|
|
def load_binfloat(self, unpack=struct.unpack):
|
|
|
|
self.append(unpack('>d', self.read(8))[0])
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[BINFLOAT[0]] = load_binfloat
|
1998-10-22 17:15:36 -03:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_string(self):
|
2000-09-15 12:14:51 -03:00
|
|
|
rep = self.readline()[:-1]
|
2003-01-28 12:23:33 -04:00
|
|
|
for q in "\"'": # double or single quote
|
2002-08-14 04:46:28 -03:00
|
|
|
if rep.startswith(q):
|
|
|
|
if not rep.endswith(q):
|
|
|
|
raise ValueError, "insecure string pickle"
|
|
|
|
rep = rep[len(q):-len(q)]
|
|
|
|
break
|
|
|
|
else:
|
2000-09-15 12:14:51 -03:00
|
|
|
raise ValueError, "insecure string pickle"
|
2007-07-19 19:19:35 -03:00
|
|
|
self.append(str(codecs.escape_decode(rep)[0], "latin-1"))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[STRING[0]] = load_string
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_binstring(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
len = mloads(b'i' + self.read(4))
|
2007-07-19 19:19:35 -03:00
|
|
|
self.append(str(self.read(len), "latin-1"))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[BINSTRING[0]] = load_binstring
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2000-03-10 19:20:09 -04:00
|
|
|
def load_unicode(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
self.append(str(self.readline()[:-1], 'raw-unicode-escape'))
|
|
|
|
dispatch[UNICODE[0]] = load_unicode
|
2000-03-10 19:20:09 -04:00
|
|
|
|
|
|
|
def load_binunicode(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
len = mloads(b'i' + self.read(4))
|
|
|
|
self.append(str(self.read(len), 'utf-8'))
|
|
|
|
dispatch[BINUNICODE[0]] = load_binunicode
|
2000-03-10 19:20:09 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_short_binstring(self):
|
2003-01-27 17:15:36 -04:00
|
|
|
len = ord(self.read(1))
|
2007-07-19 19:19:35 -03:00
|
|
|
self.append(str(self.read(len), "latin-1"))
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[SHORT_BINSTRING[0]] = load_short_binstring
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_tuple(self):
|
|
|
|
k = self.marker()
|
|
|
|
self.stack[k:] = [tuple(self.stack[k+1:])]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[TUPLE[0]] = load_tuple
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_empty_tuple(self):
|
|
|
|
self.stack.append(())
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[EMPTY_TUPLE[0]] = load_empty_tuple
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 00:14:51 -04:00
|
|
|
def load_tuple1(self):
|
|
|
|
self.stack[-1] = (self.stack[-1],)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[TUPLE1[0]] = load_tuple1
|
2003-01-28 00:14:51 -04:00
|
|
|
|
|
|
|
def load_tuple2(self):
|
|
|
|
self.stack[-2:] = [(self.stack[-2], self.stack[-1])]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[TUPLE2[0]] = load_tuple2
|
2003-01-28 00:14:51 -04:00
|
|
|
|
|
|
|
def load_tuple3(self):
|
|
|
|
self.stack[-3:] = [(self.stack[-3], self.stack[-2], self.stack[-1])]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[TUPLE3[0]] = load_tuple3
|
2003-01-28 00:14:51 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_empty_list(self):
|
|
|
|
self.stack.append([])
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[EMPTY_LIST[0]] = load_empty_list
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_empty_dictionary(self):
|
|
|
|
self.stack.append({})
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[EMPTY_DICT[0]] = load_empty_dictionary
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_list(self):
|
|
|
|
k = self.marker()
|
|
|
|
self.stack[k:] = [self.stack[k+1:]]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[LIST[0]] = load_list
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_dict(self):
|
|
|
|
k = self.marker()
|
|
|
|
d = {}
|
|
|
|
items = self.stack[k+1:]
|
|
|
|
for i in range(0, len(items), 2):
|
|
|
|
key = items[i]
|
|
|
|
value = items[i+1]
|
|
|
|
d[key] = value
|
|
|
|
self.stack[k:] = [d]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[DICT[0]] = load_dict
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-30 11:41:46 -04:00
|
|
|
# INST and OBJ differ only in how they get a class object. It's not
|
|
|
|
# only sensible to do the rest in a common routine, the two routines
|
|
|
|
# previously diverged and grew different bugs.
|
|
|
|
# klass is the class to instantiate, and k points to the topmost mark
|
|
|
|
# object, following which are the arguments for klass.__init__.
|
|
|
|
def _instantiate(self, klass, k):
|
1997-04-09 14:32:51 -03:00
|
|
|
args = tuple(self.stack[k+1:])
|
|
|
|
del self.stack[k:]
|
1998-03-26 17:13:24 -04:00
|
|
|
instantiated = 0
|
2003-01-30 11:41:46 -04:00
|
|
|
if (not args and
|
2007-06-07 20:15:56 -03:00
|
|
|
isinstance(klass, type) and
|
2003-01-30 11:41:46 -04:00
|
|
|
not hasattr(klass, "__getinitargs__")):
|
Merged revisions 55270-55324 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55271 | fred.drake | 2007-05-11 10:14:47 -0700 (Fri, 11 May 2007) | 3 lines
remove jpeg, panel libraries for SGI; there is more IRIX stuff left over,
I guess that should be removed too, but will leave for someone who is sure
........
r55280 | fred.drake | 2007-05-11 19:11:37 -0700 (Fri, 11 May 2007) | 1 line
remove mention of file that has been removed
........
r55301 | brett.cannon | 2007-05-13 17:38:05 -0700 (Sun, 13 May 2007) | 4 lines
Remove rexec and Bastion from the stdlib. This also eliminates the need for
f_restricted on frames. This in turn negates the need for
PyEval_GetRestricted() and PyFrame_IsRestricted().
........
r55303 | brett.cannon | 2007-05-13 19:22:22 -0700 (Sun, 13 May 2007) | 2 lines
Remove the md5 and sha modules.
........
r55305 | george.yoshida | 2007-05-13 19:45:55 -0700 (Sun, 13 May 2007) | 2 lines
fix markup
........
r55306 | neal.norwitz | 2007-05-13 19:47:57 -0700 (Sun, 13 May 2007) | 1 line
Get the doc building again after some removals.
........
r55307 | neal.norwitz | 2007-05-13 19:50:45 -0700 (Sun, 13 May 2007) | 1 line
Get test_pyclbr passing again after getstatus was removed from commands. This "test case" was weird since it was just importing a seemingly random module. Remove the import
........
r55322 | brett.cannon | 2007-05-14 14:09:20 -0700 (Mon, 14 May 2007) | 3 lines
Remove the compiler package. Will eventually need a mechanism to byte compile
an AST.
........
2007-05-14 19:03:55 -03:00
|
|
|
value = _EmptyClass()
|
|
|
|
value.__class__ = klass
|
|
|
|
instantiated = 1
|
1998-03-26 17:13:24 -04:00
|
|
|
if not instantiated:
|
1998-09-15 17:25:57 -03:00
|
|
|
try:
|
2003-01-28 18:29:13 -04:00
|
|
|
value = klass(*args)
|
2007-01-10 12:19:56 -04:00
|
|
|
except TypeError as err:
|
1998-09-15 17:25:57 -03:00
|
|
|
raise TypeError, "in constructor for %s: %s" % (
|
|
|
|
klass.__name__, str(err)), sys.exc_info()[2]
|
1997-04-09 14:32:51 -03:00
|
|
|
self.append(value)
|
2003-01-30 11:41:46 -04:00
|
|
|
|
|
|
|
def load_inst(self):
|
|
|
|
module = self.readline()[:-1]
|
|
|
|
name = self.readline()[:-1]
|
|
|
|
klass = self.find_class(module, name)
|
|
|
|
self._instantiate(klass, self.marker())
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[INST[0]] = load_inst
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_obj(self):
|
2003-01-30 11:41:46 -04:00
|
|
|
# Stack is ... markobject classobject arg1 arg2 ...
|
1997-04-09 14:32:51 -03:00
|
|
|
k = self.marker()
|
2003-01-30 11:41:46 -04:00
|
|
|
klass = self.stack.pop(k+1)
|
|
|
|
self._instantiate(klass, k)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[OBJ[0]] = load_obj
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-28 11:10:22 -04:00
|
|
|
def load_newobj(self):
|
|
|
|
args = self.stack.pop()
|
|
|
|
cls = self.stack[-1]
|
|
|
|
obj = cls.__new__(cls, *args)
|
2003-01-28 13:55:05 -04:00
|
|
|
self.stack[-1] = obj
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[NEWOBJ[0]] = load_newobj
|
2003-01-28 11:10:22 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_global(self):
|
|
|
|
module = self.readline()[:-1]
|
|
|
|
name = self.readline()[:-1]
|
|
|
|
klass = self.find_class(module, name)
|
|
|
|
self.append(klass)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[GLOBAL[0]] = load_global
|
1997-04-09 14:32:51 -03:00
|
|
|
|
2003-01-29 02:14:11 -04:00
|
|
|
def load_ext1(self):
|
|
|
|
code = ord(self.read(1))
|
|
|
|
self.get_extension(code)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[EXT1[0]] = load_ext1
|
2003-01-29 02:14:11 -04:00
|
|
|
|
|
|
|
def load_ext2(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
code = mloads(b'i' + self.read(2) + b'\000\000')
|
2003-01-29 02:14:11 -04:00
|
|
|
self.get_extension(code)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[EXT2[0]] = load_ext2
|
2003-01-29 02:14:11 -04:00
|
|
|
|
|
|
|
def load_ext4(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
code = mloads(b'i' + self.read(4))
|
2003-01-29 02:14:11 -04:00
|
|
|
self.get_extension(code)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[EXT4[0]] = load_ext4
|
2003-01-29 02:14:11 -04:00
|
|
|
|
|
|
|
def get_extension(self, code):
|
|
|
|
nil = []
|
2003-02-03 21:54:49 -04:00
|
|
|
obj = _extension_cache.get(code, nil)
|
2003-01-29 02:14:11 -04:00
|
|
|
if obj is not nil:
|
|
|
|
self.append(obj)
|
|
|
|
return
|
2003-02-03 21:54:49 -04:00
|
|
|
key = _inverted_registry.get(code)
|
2003-01-29 02:14:11 -04:00
|
|
|
if not key:
|
|
|
|
raise ValueError("unregistered extension code %d" % code)
|
|
|
|
obj = self.find_class(*key)
|
2003-02-03 21:54:49 -04:00
|
|
|
_extension_cache[code] = obj
|
2003-01-29 02:14:11 -04:00
|
|
|
self.append(obj)
|
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def find_class(self, module, name):
|
2003-01-28 18:29:13 -04:00
|
|
|
# Subclasses may override this
|
2007-05-04 17:30:19 -03:00
|
|
|
module = str(module)
|
|
|
|
name = str(name)
|
2001-11-15 19:42:58 -04:00
|
|
|
__import__(module)
|
|
|
|
mod = sys.modules[module]
|
|
|
|
klass = getattr(mod, name)
|
1997-04-09 14:32:51 -03:00
|
|
|
return klass
|
|
|
|
|
|
|
|
def load_reduce(self):
|
|
|
|
stack = self.stack
|
2003-01-28 18:29:13 -04:00
|
|
|
args = stack.pop()
|
|
|
|
func = stack[-1]
|
2007-07-19 21:22:32 -03:00
|
|
|
try:
|
|
|
|
value = func(*args)
|
|
|
|
except:
|
|
|
|
print(sys.exc_info())
|
|
|
|
print(func, args)
|
|
|
|
raise
|
2003-01-28 18:29:13 -04:00
|
|
|
stack[-1] = value
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[REDUCE[0]] = load_reduce
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_pop(self):
|
|
|
|
del self.stack[-1]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[POP[0]] = load_pop
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_pop_mark(self):
|
|
|
|
k = self.marker()
|
1998-03-26 17:13:24 -04:00
|
|
|
del self.stack[k:]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[POP_MARK[0]] = load_pop_mark
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_dup(self):
|
1998-03-31 13:00:46 -04:00
|
|
|
self.append(self.stack[-1])
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[DUP[0]] = load_dup
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_get(self):
|
2007-05-08 18:26:54 -03:00
|
|
|
self.append(self.memo[str8(self.readline())[:-1]])
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[GET[0]] = load_get
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_binget(self):
|
2003-01-27 17:15:36 -04:00
|
|
|
i = ord(self.read(1))
|
2004-02-12 13:35:32 -04:00
|
|
|
self.append(self.memo[repr(i)])
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[BINGET[0]] = load_binget
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_long_binget(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
i = mloads(b'i' + self.read(4))
|
2004-02-12 13:35:32 -04:00
|
|
|
self.append(self.memo[repr(i)])
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[LONG_BINGET[0]] = load_long_binget
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_put(self):
|
2007-05-04 17:30:19 -03:00
|
|
|
self.memo[str(self.readline()[:-1])] = self.stack[-1]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[PUT[0]] = load_put
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_binput(self):
|
2003-01-27 17:15:36 -04:00
|
|
|
i = ord(self.read(1))
|
2004-02-12 13:35:32 -04:00
|
|
|
self.memo[repr(i)] = self.stack[-1]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[BINPUT[0]] = load_binput
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_long_binput(self):
|
2007-05-04 16:56:22 -03:00
|
|
|
i = mloads(b'i' + self.read(4))
|
2004-02-12 13:35:32 -04:00
|
|
|
self.memo[repr(i)] = self.stack[-1]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[LONG_BINPUT[0]] = load_long_binput
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_append(self):
|
|
|
|
stack = self.stack
|
2002-06-30 00:39:14 -03:00
|
|
|
value = stack.pop()
|
1997-04-09 14:32:51 -03:00
|
|
|
list = stack[-1]
|
|
|
|
list.append(value)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[APPEND[0]] = load_append
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_appends(self):
|
|
|
|
stack = self.stack
|
|
|
|
mark = self.marker()
|
|
|
|
list = stack[mark - 1]
|
2003-01-27 21:44:45 -04:00
|
|
|
list.extend(stack[mark + 1:])
|
1997-04-09 14:32:51 -03:00
|
|
|
del stack[mark:]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[APPENDS[0]] = load_appends
|
2001-01-14 20:50:52 -04:00
|
|
|
|
1997-04-09 14:32:51 -03:00
|
|
|
def load_setitem(self):
|
|
|
|
stack = self.stack
|
2002-06-30 00:39:14 -03:00
|
|
|
value = stack.pop()
|
|
|
|
key = stack.pop()
|
1997-04-09 14:32:51 -03:00
|
|
|
dict = stack[-1]
|
|
|
|
dict[key] = value
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[SETITEM[0]] = load_setitem
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_setitems(self):
|
|
|
|
stack = self.stack
|
|
|
|
mark = self.marker()
|
|
|
|
dict = stack[mark - 1]
|
1998-03-26 17:13:24 -04:00
|
|
|
for i in range(mark + 1, len(stack), 2):
|
1997-04-09 14:32:51 -03:00
|
|
|
dict[stack[i]] = stack[i + 1]
|
|
|
|
|
|
|
|
del stack[mark:]
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[SETITEMS[0]] = load_setitems
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_build(self):
|
|
|
|
stack = self.stack
|
2003-01-28 18:01:16 -04:00
|
|
|
state = stack.pop()
|
1997-04-09 14:32:51 -03:00
|
|
|
inst = stack[-1]
|
2003-01-28 18:01:16 -04:00
|
|
|
setstate = getattr(inst, "__setstate__", None)
|
|
|
|
if setstate:
|
|
|
|
setstate(state)
|
|
|
|
return
|
|
|
|
slotstate = None
|
|
|
|
if isinstance(state, tuple) and len(state) == 2:
|
|
|
|
state, slotstate = state
|
|
|
|
if state:
|
Merged revisions 55270-55324 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55271 | fred.drake | 2007-05-11 10:14:47 -0700 (Fri, 11 May 2007) | 3 lines
remove jpeg, panel libraries for SGI; there is more IRIX stuff left over,
I guess that should be removed too, but will leave for someone who is sure
........
r55280 | fred.drake | 2007-05-11 19:11:37 -0700 (Fri, 11 May 2007) | 1 line
remove mention of file that has been removed
........
r55301 | brett.cannon | 2007-05-13 17:38:05 -0700 (Sun, 13 May 2007) | 4 lines
Remove rexec and Bastion from the stdlib. This also eliminates the need for
f_restricted on frames. This in turn negates the need for
PyEval_GetRestricted() and PyFrame_IsRestricted().
........
r55303 | brett.cannon | 2007-05-13 19:22:22 -0700 (Sun, 13 May 2007) | 2 lines
Remove the md5 and sha modules.
........
r55305 | george.yoshida | 2007-05-13 19:45:55 -0700 (Sun, 13 May 2007) | 2 lines
fix markup
........
r55306 | neal.norwitz | 2007-05-13 19:47:57 -0700 (Sun, 13 May 2007) | 1 line
Get the doc building again after some removals.
........
r55307 | neal.norwitz | 2007-05-13 19:50:45 -0700 (Sun, 13 May 2007) | 1 line
Get test_pyclbr passing again after getstatus was removed from commands. This "test case" was weird since it was just importing a seemingly random module. Remove the import
........
r55322 | brett.cannon | 2007-05-14 14:09:20 -0700 (Mon, 14 May 2007) | 3 lines
Remove the compiler package. Will eventually need a mechanism to byte compile
an AST.
........
2007-05-14 19:03:55 -03:00
|
|
|
inst.__dict__.update(state)
|
2003-01-28 18:01:16 -04:00
|
|
|
if slotstate:
|
|
|
|
for k, v in slotstate.items():
|
|
|
|
setattr(inst, k, v)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[BUILD[0]] = load_build
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_mark(self):
|
|
|
|
self.append(self.mark)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[MARK[0]] = load_mark
|
1997-04-09 14:32:51 -03:00
|
|
|
|
|
|
|
def load_stop(self):
|
2002-06-30 00:39:14 -03:00
|
|
|
value = self.stack.pop()
|
2000-12-13 14:11:56 -04:00
|
|
|
raise _Stop(value)
|
2007-05-04 16:56:22 -03:00
|
|
|
dispatch[STOP[0]] = load_stop
|
1995-01-09 20:31:14 -04:00
|
|
|
|
1997-12-05 15:42:42 -04:00
|
|
|
# Helper class for load_inst/load_obj
|
|
|
|
|
|
|
|
class _EmptyClass:
|
|
|
|
pass
|
1995-01-09 20:31:14 -04:00
|
|
|
|
2003-01-30 23:43:58 -04:00
|
|
|
# Encode/decode longs in linear time.
|
|
|
|
|
|
|
|
import binascii as _binascii
|
2003-01-27 23:49:52 -04:00
|
|
|
|
|
|
|
def encode_long(x):
|
2003-01-30 23:43:58 -04:00
|
|
|
r"""Encode a long to a two's complement little-endian binary string.
|
2007-01-15 12:59:06 -04:00
|
|
|
Note that 0 is a special case, returning an empty string, to save a
|
2003-01-31 12:43:39 -04:00
|
|
|
byte in the LONG1 pickling context.
|
|
|
|
|
2007-01-15 12:59:06 -04:00
|
|
|
>>> encode_long(0)
|
2007-05-08 18:26:54 -03:00
|
|
|
b''
|
2007-01-15 12:59:06 -04:00
|
|
|
>>> encode_long(255)
|
2007-05-08 18:26:54 -03:00
|
|
|
b'\xff\x00'
|
2007-01-15 12:59:06 -04:00
|
|
|
>>> encode_long(32767)
|
2007-05-08 18:26:54 -03:00
|
|
|
b'\xff\x7f'
|
2007-01-15 12:59:06 -04:00
|
|
|
>>> encode_long(-256)
|
2007-05-08 18:26:54 -03:00
|
|
|
b'\x00\xff'
|
2007-01-15 12:59:06 -04:00
|
|
|
>>> encode_long(-32768)
|
2007-05-08 18:26:54 -03:00
|
|
|
b'\x00\x80'
|
2007-01-15 12:59:06 -04:00
|
|
|
>>> encode_long(-128)
|
2007-05-08 18:26:54 -03:00
|
|
|
b'\x80'
|
2007-01-15 12:59:06 -04:00
|
|
|
>>> encode_long(127)
|
2007-05-08 18:26:54 -03:00
|
|
|
b'\x7f'
|
2003-01-27 23:49:52 -04:00
|
|
|
>>>
|
|
|
|
"""
|
2003-01-30 23:43:58 -04:00
|
|
|
|
|
|
|
if x == 0:
|
2007-05-08 18:26:54 -03:00
|
|
|
return b''
|
2003-01-30 23:43:58 -04:00
|
|
|
if x > 0:
|
|
|
|
ashex = hex(x)
|
|
|
|
assert ashex.startswith("0x")
|
|
|
|
njunkchars = 2 + ashex.endswith('L')
|
|
|
|
nibbles = len(ashex) - njunkchars
|
|
|
|
if nibbles & 1:
|
|
|
|
# need an even # of nibbles for unhexlify
|
|
|
|
ashex = "0x0" + ashex[2:]
|
2003-01-31 12:43:39 -04:00
|
|
|
elif int(ashex[2], 16) >= 8:
|
2003-01-30 23:43:58 -04:00
|
|
|
# "looks negative", so need a byte of sign bits
|
|
|
|
ashex = "0x00" + ashex[2:]
|
|
|
|
else:
|
|
|
|
# Build the 256's-complement: (1L << nbytes) + x. The trick is
|
|
|
|
# to find the number of bytes in linear time (although that should
|
|
|
|
# really be a constant-time task).
|
|
|
|
ashex = hex(-x)
|
|
|
|
assert ashex.startswith("0x")
|
|
|
|
njunkchars = 2 + ashex.endswith('L')
|
|
|
|
nibbles = len(ashex) - njunkchars
|
|
|
|
if nibbles & 1:
|
cPickle.c: Full support for the new LONG1 and LONG4. Added comments.
Assorted code cleanups; e.g., sizeof(char) is 1 by definition, so there's
no need to do things like multiply by sizeof(char) in hairy malloc
arguments. Fixed an undetected-overflow bug in readline_file().
longobject.c: Fixed a really stupid bug in the new _PyLong_NumBits.
pickle.py: Fixed stupid bug in save_long(): When proto is 2, it
wrote LONG1 or LONG4, but forgot to return then -- it went on to
append the proto 1 LONG opcode too.
Fixed equally stupid cancelling bugs in load_long1() and
load_long4(): they *returned* the unpickled long instead of pushing
it on the stack. The return values were ignored. Tests passed
before only because save_long() pickled the long twice.
Fixed bugs in encode_long().
Noted that decode_long() is quadratic-time despite our hopes,
because long(string, 16) is still quadratic-time in len(string).
It's hex() that's linear-time. I don't know a way to make decode_long()
linear-time in Python, short of maybe transforming the 256's-complement
bytes into marshal's funky internal format, and letting marshal decode
that. It would be more valuable to make long(string, 16) linear time.
pickletester.py: Added a global "protocols" vector so tests can try
all the protocols in a sane way. Changed test_ints() and test_unicode()
to do so. Added a new test_long(), but the tail end of it is disabled
because it "takes forever" under pickle.py (but runs very quickly under
cPickle: cPickle proto 2 for longs is linear-time).
2003-02-01 22:57:53 -04:00
|
|
|
# Extend to a full byte.
|
2003-01-30 23:43:58 -04:00
|
|
|
nibbles += 1
|
2003-01-31 12:43:39 -04:00
|
|
|
nbits = nibbles * 4
|
2007-01-15 12:59:06 -04:00
|
|
|
x += 1 << nbits
|
2003-01-30 23:43:58 -04:00
|
|
|
assert x > 0
|
|
|
|
ashex = hex(x)
|
cPickle.c: Full support for the new LONG1 and LONG4. Added comments.
Assorted code cleanups; e.g., sizeof(char) is 1 by definition, so there's
no need to do things like multiply by sizeof(char) in hairy malloc
arguments. Fixed an undetected-overflow bug in readline_file().
longobject.c: Fixed a really stupid bug in the new _PyLong_NumBits.
pickle.py: Fixed stupid bug in save_long(): When proto is 2, it
wrote LONG1 or LONG4, but forgot to return then -- it went on to
append the proto 1 LONG opcode too.
Fixed equally stupid cancelling bugs in load_long1() and
load_long4(): they *returned* the unpickled long instead of pushing
it on the stack. The return values were ignored. Tests passed
before only because save_long() pickled the long twice.
Fixed bugs in encode_long().
Noted that decode_long() is quadratic-time despite our hopes,
because long(string, 16) is still quadratic-time in len(string).
It's hex() that's linear-time. I don't know a way to make decode_long()
linear-time in Python, short of maybe transforming the 256's-complement
bytes into marshal's funky internal format, and letting marshal decode
that. It would be more valuable to make long(string, 16) linear time.
pickletester.py: Added a global "protocols" vector so tests can try
all the protocols in a sane way. Changed test_ints() and test_unicode()
to do so. Added a new test_long(), but the tail end of it is disabled
because it "takes forever" under pickle.py (but runs very quickly under
cPickle: cPickle proto 2 for longs is linear-time).
2003-02-01 22:57:53 -04:00
|
|
|
njunkchars = 2 + ashex.endswith('L')
|
|
|
|
newnibbles = len(ashex) - njunkchars
|
|
|
|
if newnibbles < nibbles:
|
|
|
|
ashex = "0x" + "0" * (nibbles - newnibbles) + ashex[2:]
|
|
|
|
if int(ashex[2], 16) < 8:
|
2003-01-30 23:43:58 -04:00
|
|
|
# "looks positive", so need a byte of sign bits
|
cPickle.c: Full support for the new LONG1 and LONG4. Added comments.
Assorted code cleanups; e.g., sizeof(char) is 1 by definition, so there's
no need to do things like multiply by sizeof(char) in hairy malloc
arguments. Fixed an undetected-overflow bug in readline_file().
longobject.c: Fixed a really stupid bug in the new _PyLong_NumBits.
pickle.py: Fixed stupid bug in save_long(): When proto is 2, it
wrote LONG1 or LONG4, but forgot to return then -- it went on to
append the proto 1 LONG opcode too.
Fixed equally stupid cancelling bugs in load_long1() and
load_long4(): they *returned* the unpickled long instead of pushing
it on the stack. The return values were ignored. Tests passed
before only because save_long() pickled the long twice.
Fixed bugs in encode_long().
Noted that decode_long() is quadratic-time despite our hopes,
because long(string, 16) is still quadratic-time in len(string).
It's hex() that's linear-time. I don't know a way to make decode_long()
linear-time in Python, short of maybe transforming the 256's-complement
bytes into marshal's funky internal format, and letting marshal decode
that. It would be more valuable to make long(string, 16) linear time.
pickletester.py: Added a global "protocols" vector so tests can try
all the protocols in a sane way. Changed test_ints() and test_unicode()
to do so. Added a new test_long(), but the tail end of it is disabled
because it "takes forever" under pickle.py (but runs very quickly under
cPickle: cPickle proto 2 for longs is linear-time).
2003-02-01 22:57:53 -04:00
|
|
|
ashex = "0xff" + ashex[2:]
|
2003-01-30 23:43:58 -04:00
|
|
|
|
|
|
|
if ashex.endswith('L'):
|
|
|
|
ashex = ashex[2:-1]
|
|
|
|
else:
|
|
|
|
ashex = ashex[2:]
|
cPickle.c: Full support for the new LONG1 and LONG4. Added comments.
Assorted code cleanups; e.g., sizeof(char) is 1 by definition, so there's
no need to do things like multiply by sizeof(char) in hairy malloc
arguments. Fixed an undetected-overflow bug in readline_file().
longobject.c: Fixed a really stupid bug in the new _PyLong_NumBits.
pickle.py: Fixed stupid bug in save_long(): When proto is 2, it
wrote LONG1 or LONG4, but forgot to return then -- it went on to
append the proto 1 LONG opcode too.
Fixed equally stupid cancelling bugs in load_long1() and
load_long4(): they *returned* the unpickled long instead of pushing
it on the stack. The return values were ignored. Tests passed
before only because save_long() pickled the long twice.
Fixed bugs in encode_long().
Noted that decode_long() is quadratic-time despite our hopes,
because long(string, 16) is still quadratic-time in len(string).
It's hex() that's linear-time. I don't know a way to make decode_long()
linear-time in Python, short of maybe transforming the 256's-complement
bytes into marshal's funky internal format, and letting marshal decode
that. It would be more valuable to make long(string, 16) linear time.
pickletester.py: Added a global "protocols" vector so tests can try
all the protocols in a sane way. Changed test_ints() and test_unicode()
to do so. Added a new test_long(), but the tail end of it is disabled
because it "takes forever" under pickle.py (but runs very quickly under
cPickle: cPickle proto 2 for longs is linear-time).
2003-02-01 22:57:53 -04:00
|
|
|
assert len(ashex) & 1 == 0, (x, ashex)
|
2003-01-30 23:43:58 -04:00
|
|
|
binary = _binascii.unhexlify(ashex)
|
2007-05-08 18:26:54 -03:00
|
|
|
return bytes(binary[::-1])
|
2003-01-27 23:49:52 -04:00
|
|
|
|
|
|
|
def decode_long(data):
|
|
|
|
r"""Decode a long from a two's complement little-endian binary string.
|
2003-01-31 12:43:39 -04:00
|
|
|
|
2007-05-08 18:26:54 -03:00
|
|
|
>>> decode_long(b'')
|
2006-08-18 19:13:04 -03:00
|
|
|
0
|
2007-05-08 18:26:54 -03:00
|
|
|
>>> decode_long(b"\xff\x00")
|
2006-08-18 19:13:04 -03:00
|
|
|
255
|
2007-05-08 18:26:54 -03:00
|
|
|
>>> decode_long(b"\xff\x7f")
|
2006-08-18 19:13:04 -03:00
|
|
|
32767
|
2007-05-08 18:26:54 -03:00
|
|
|
>>> decode_long(b"\x00\xff")
|
2006-08-18 19:13:04 -03:00
|
|
|
-256
|
2007-05-08 18:26:54 -03:00
|
|
|
>>> decode_long(b"\x00\x80")
|
2006-08-18 19:13:04 -03:00
|
|
|
-32768
|
2007-05-08 18:26:54 -03:00
|
|
|
>>> decode_long(b"\x80")
|
2006-08-18 19:13:04 -03:00
|
|
|
-128
|
2007-05-08 18:26:54 -03:00
|
|
|
>>> decode_long(b"\x7f")
|
2006-08-18 19:13:04 -03:00
|
|
|
127
|
2003-01-27 23:49:52 -04:00
|
|
|
"""
|
2003-01-30 23:43:58 -04:00
|
|
|
|
2003-01-31 12:43:39 -04:00
|
|
|
nbytes = len(data)
|
|
|
|
if nbytes == 0:
|
2007-01-15 12:59:06 -04:00
|
|
|
return 0
|
2003-01-30 23:43:58 -04:00
|
|
|
ashex = _binascii.hexlify(data[::-1])
|
2007-01-15 12:59:06 -04:00
|
|
|
n = int(ashex, 16) # quadratic time before Python 2.3; linear now
|
2007-05-08 18:26:54 -03:00
|
|
|
if data[-1] >= 0x80:
|
2007-01-15 12:59:06 -04:00
|
|
|
n -= 1 << (nbytes * 8)
|
2003-01-30 23:43:58 -04:00
|
|
|
return n
|
2003-01-27 23:49:52 -04:00
|
|
|
|
1995-03-14 11:09:05 -04:00
|
|
|
# Shorthands
|
|
|
|
|
2004-12-05 01:20:42 -04:00
|
|
|
def dump(obj, file, protocol=None):
|
|
|
|
Pickler(file, protocol).dump(obj)
|
1995-03-14 11:09:05 -04:00
|
|
|
|
2004-12-05 01:20:42 -04:00
|
|
|
def dumps(obj, protocol=None):
|
2007-05-08 18:26:54 -03:00
|
|
|
f = io.BytesIO()
|
|
|
|
Pickler(f, protocol).dump(obj)
|
|
|
|
res = f.getvalue()
|
|
|
|
assert isinstance(res, bytes)
|
|
|
|
return res
|
1995-03-14 11:09:05 -04:00
|
|
|
|
|
|
|
def load(file):
|
1997-04-09 14:32:51 -03:00
|
|
|
return Unpickler(file).load()
|
1995-03-14 11:09:05 -04:00
|
|
|
|
2007-05-08 18:26:54 -03:00
|
|
|
def loads(s):
|
|
|
|
if isinstance(s, str):
|
|
|
|
raise TypeError("Can't load pickle from unicode string")
|
|
|
|
file = io.BytesIO(s)
|
1997-04-09 14:32:51 -03:00
|
|
|
return Unpickler(file).load()
|
2003-01-27 23:49:52 -04:00
|
|
|
|
|
|
|
# Doctest
|
|
|
|
|
|
|
|
def _test():
|
|
|
|
import doctest
|
|
|
|
return doctest.testmod()
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
_test()
|