ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Checkpoint. A b it closer to working pickles and pickletools.

Browse source 
Added 'Y' getargs opcode which requires a bytes object.
This commit is contained in:
Guido van Rossum 2007-05-07 23:57:08 +00:00
parent 805365ee39
commit 617dbc4d64
4 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/cPickle.c
View file

@ -1335,7 +1335,8 @@ save_unicode(Picklerobject *self, PyObject *args, int doput)
if (!( repr = PyUnicode_AsUTF8String(args)))
return -1;
if ((size = PyString_Size(repr)) < 0)
assert(PyBytes_Check(repr));
if ((size = PyBytes_Size(repr)) < 0)
goto err;
if (size > INT_MAX)
return -1; /* string too large */
@ -1354,7 +1355,7 @@ save_unicode(Picklerobject *self, PyObject *args, int doput)
PDATA_APPEND(self->file, repr, -1);
}
else {
if (self->write_func(self, PyString_AS_STRING(repr),
if (self->write_func(self, PyBytes_AS_STRING(repr),
size) < 0)
goto err;
}
@ -5275,8 +5276,11 @@ cpm_loads(PyObject *self, PyObject *args)
PyObject *ob, *file = 0, *res = NULL;
Unpicklerobject *unpickler = 0;
if (!( PyArg_ParseTuple(args, "S:loads", &ob)))
goto finally;
if (!( PyArg_ParseTuple(args, "S:loads", &ob))) {
PyErr_Clear();
if (!PyArg_ParseTuple(args, "Y:loads", &ob))
goto finally;
}
if (!( file = PycStringIO->NewInput(ob)))
goto finally;