diff options
author | Fred Drake <fdrake@acm.org> | 2001-03-22 17:52:17 +0000 |
---|---|---|
committer | Fred Drake <fdrake@acm.org> | 2001-03-22 17:52:17 +0000 |
commit | df070bcde919cdfcd0a951c37ea63acfac71227a (patch) | |
tree | 17e1773566ed5b73a974169b22ab0d102849eb1a /Modules | |
parent | 27483a8b6557553b98fd8eb253de409555f1abfc (diff) | |
download | cpython-df070bcde919cdfcd0a951c37ea63acfac71227a.tar.gz |
Make cPickle use the recently-added PyInstance_NewRaw() API to create
instance objects without calling the constructor. This is the same as
the new.instance() function.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/cPickle.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 405456d480..92325b6730 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -2922,20 +2922,12 @@ Instance_New(PyObject *cls, PyObject *args) { UNLESS (__getinitargs__=PyObject_GetAttr(cls, __getinitargs___str)) { /* We have a class with no __getinitargs__, so bypass usual construction */ - PyInstanceObject *inst; + PyObject *inst; PyErr_Clear(); - UNLESS (inst=PyObject_New(PyInstanceObject, &PyInstance_Type)) + UNLESS (inst=PyInstance_NewRaw(cls, NULL)) goto err; - inst->in_class=(PyClassObject*)cls; - Py_INCREF(cls); - UNLESS (inst->in_dict=PyDict_New()) { - inst = (PyInstanceObject *) PyObject_AS_GC(inst); - PyObject_DEL(inst); - goto err; - } - PyObject_GC_Init(inst); - return (PyObject *)inst; + return inst; } Py_DECREF(__getinitargs__); } |