traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Oops. Jim's fix didn't. This one does -- I tested it a bit better 

this time!
This commit is contained in:
Guido van Rossum 2000-09-07 14:35:37 +00:00
parent 6300bd42a4
commit ebba420285
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Modules/cPickle.c
View File

@ -4386,7 +4386,7 @@ static struct PyMethodDef cPickle_methods[] = {
}; };
static int static int
init_stuff(PyObject *module, PyObject *module_dict) { init_stuff(PyObject *module_dict) {
PyObject *string, *copy_reg, *t, *r; PyObject *string, *copy_reg, *t, *r;
#define INIT_STR(S) UNLESS(S ## _str=PyString_FromString(#S)) return -1; #define INIT_STR(S) UNLESS(S ## _str=PyString_FromString(#S)) return -1;
@ -4516,17 +4516,23 @@ init_stuff(PyObject *module, PyObject *module_dict) {
#endif #endif
DL_EXPORT(void) DL_EXPORT(void)
initcPickle(void) { initcPickle(void) {
PyObject *m, *d, *v; PyObject *m, *d, *di, *v, *k;
int i;
char *rev="1.71"; char *rev="1.71";
PyObject *format_version; PyObject *format_version;
PyObject *compatible_formats; PyObject *compatible_formats;
if (init_stuff(m, d) < 0) return;
Picklertype.ob_type = &PyType_Type; Picklertype.ob_type = &PyType_Type;
Unpicklertype.ob_type = &PyType_Type; Unpicklertype.ob_type = &PyType_Type;
PdataType.ob_type = &PyType_Type; PdataType.ob_type = &PyType_Type;
/* Initialize some pieces. We need to do this before module creation,
so we're forced to use a temporary dictionary. :(
*/
di=PyDict_New();
if (!di) return;
if (init_stuff(di) < 0) return;
/* Create the module and add the functions */ /* Create the module and add the functions */
m = Py_InitModule4("cPickle", cPickle_methods, m = Py_InitModule4("cPickle", cPickle_methods,
cPickle_module_documentation, cPickle_module_documentation,
@ -4537,6 +4543,15 @@ initcPickle(void) {
PyDict_SetItemString(d,"__version__", v = PyString_FromString(rev)); PyDict_SetItemString(d,"__version__", v = PyString_FromString(rev));
Py_XDECREF(v); Py_XDECREF(v);
/* Copy data from di. Waaa. */
for (i=0; PyDict_Next(di, &i, &k, &v); ) {
if (PyObject_SetItem(d, k, v) < 0) {
Py_DECREF(di);
return;
}
}
Py_DECREF(di);
format_version = PyString_FromString("1.3"); format_version = PyString_FromString("1.3");
compatible_formats = Py_BuildValue("[sss]", "1.0", "1.1", "1.2"); compatible_formats = Py_BuildValue("[sss]", "1.0", "1.1", "1.2");