mirror of
https://github.com/python/cpython.git
synced 2026-01-06 15:32:22 +00:00
Charles Waldman writes:
"""
Problem description:
Run the following script:
import test.test_cpickle
for x in xrange(1000000):
reload(test.test_cpickle)
Watch Python's memory use go up up and away!
In the course of debugging this I also saw that cPickle is
inconsistent with pickle - if you attempt a pickle.load or pickle.dump
on a closed file, you get a ValueError, whereas the corresponding
cPickle operations give an IOError. Since cPickle is advertised as
being compatible with pickle, I changed these exceptions to match.
"""
This commit is contained in:
parent
2dd8dddef4
commit
83addc7a0f
1 changed files with 11 additions and 14 deletions
|
|
@ -2151,19 +2151,18 @@ newPicklerobject(PyObject *file, int bin) {
|
|||
Py_INCREF(file);
|
||||
else
|
||||
file=Pdata_New();
|
||||
|
||||
UNLESS (self->file = file)
|
||||
goto err;
|
||||
|
||||
self->file = file;
|
||||
|
||||
UNLESS (self->memo = PyDict_New()) {
|
||||
Py_XDECREF((PyObject *)self);
|
||||
return NULL;
|
||||
}
|
||||
UNLESS (self->memo = PyDict_New())
|
||||
goto err;
|
||||
|
||||
if (PyFile_Check(file)) {
|
||||
self->fp = PyFile_AsFile(file);
|
||||
if (self->fp == NULL) {
|
||||
PyErr_SetString(PyExc_IOError, "output file closed");
|
||||
return NULL;
|
||||
PyErr_SetString(PyExc_ValueError, "I/O operation on closed file");
|
||||
goto err;
|
||||
}
|
||||
self->write_func = write_file;
|
||||
}
|
||||
|
|
@ -4054,10 +4053,8 @@ newUnpicklerobject(PyObject *f) {
|
|||
self->safe_constructors = NULL;
|
||||
self->find_class = NULL;
|
||||
|
||||
UNLESS (self->memo = PyDict_New()) {
|
||||
Py_XDECREF((PyObject *)self);
|
||||
return NULL;
|
||||
}
|
||||
UNLESS (self->memo = PyDict_New())
|
||||
goto err;
|
||||
|
||||
Py_INCREF(f);
|
||||
self->file = f;
|
||||
|
|
@ -4066,8 +4063,8 @@ newUnpicklerobject(PyObject *f) {
|
|||
if (PyFile_Check(f)) {
|
||||
self->fp = PyFile_AsFile(f);
|
||||
if (self->fp == NULL) {
|
||||
PyErr_SetString(PyExc_IOError, "input file closed");
|
||||
return NULL;
|
||||
PyErr_SetString(PyExc_ValueError, "I/O operation on closed file");
|
||||
goto err;
|
||||
}
|
||||
self->read_func = read_file;
|
||||
self->readline_func = readline_file;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue