Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Style cleanups for pickle.py and _pickle.

This commit is contained in:
Alexandre Vassalotti 2013-04-14 02:25:10 -07:00
parent f36f20f850
commit cc7571727f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/pickle.py
View File

@ -933,7 +933,7 @@ class _Unpickler:
n = mloads(b'i' + self.read(4))
if n < 0:
# Corrupt or hostile pickle -- we never write one like this
raise UnpicklingError("LONG pickle has negative byte count");
raise UnpicklingError("LONG pickle has negative byte count")
data = self.read(n)
self.append(decode_long(data))
dispatch[LONG4[0]] = load_long4
@ -965,7 +965,7 @@ class _Unpickler:
# Deprecated BINSTRING uses signed 32-bit length
len = mloads(b'i' + self.read(4))
if len < 0:
raise UnpicklingError("BINSTRING pickle has negative byte count");
raise UnpicklingError("BINSTRING pickle has negative byte count")
data = self.read(len)
value = str(data, self.encoding, self.errors)
self.append(value)
@ -974,7 +974,8 @@ class _Unpickler:
def load_binbytes(self, unpack=struct.unpack, maxsize=sys.maxsize):
len, = unpack('<I', self.read(4))
if len > maxsize:
raise UnpicklingError("BINBYTES exceeds system's maximum size of %d bytes" % maxsize);
raise UnpicklingError("BINBYTES exceeds system's maximum size "
"of %d bytes" % maxsize)
self.append(self.read(len))
dispatch[BINBYTES[0]] = load_binbytes
@ -985,7 +986,8 @@ class _Unpickler:
def load_binunicode(self, unpack=struct.unpack, maxsize=sys.maxsize):
len, = unpack('<I', self.read(4))
if len > maxsize:
raise UnpicklingError("BINUNICODE exceeds system's maximum size of %d bytes" % maxsize);
raise UnpicklingError("BINUNICODE exceeds system's maximum size "
"of %d bytes" % maxsize)
self.append(str(self.read(len), 'utf-8', 'surrogatepass'))
dispatch[BINUNICODE[0]] = load_binunicode
@ -1118,7 +1120,7 @@ class _Unpickler:
if not key:
if code <= 0: # note that 0 is forbidden
# Corrupt or hostile pickle.
raise UnpicklingError("EXT specifies code <= 0");
raise UnpicklingError("EXT specifies code <= 0")
raise ValueError("unregistered extension code %d" % code)
obj = self.find_class(*key)
_extension_cache[code] = obj

6
Modules/_pickle.c
View File

@ -4260,8 +4260,7 @@ load_binbytes(UnpicklerObject *self)
if (x < 0) {
PyErr_Format(PyExc_OverflowError,
"BINBYTES exceeds system's maximum size of %zd bytes",
PY_SSIZE_T_MAX
);
PY_SSIZE_T_MAX);
return -1;
}
@ -4385,8 +4384,7 @@ load_binunicode(UnpicklerObject *self)
if (size < 0) {
PyErr_Format(PyExc_OverflowError,
"BINUNICODE exceeds system's maximum size of %zd bytes",
PY_SSIZE_T_MAX
);
PY_SSIZE_T_MAX);
return -1;
}