Commit 64c82063 authored by Jeremy Hylton's avatar Jeremy Hylton

Don't decref cache in Per_dealloc().

The cache decrefed it in percachedel.
parent 7405d5e0
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.65 2002/10/16 16:12:48 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.66 2003/04/01 16:08:14 jeremy Exp $\n";
#include "cPersistence.h" #include "cPersistence.h"
...@@ -434,7 +434,6 @@ Per_dealloc(cPersistentObject *self) ...@@ -434,7 +434,6 @@ Per_dealloc(cPersistentObject *self)
if (idebug_log < 0) call_debug("del",self); if (idebug_log < 0) call_debug("del",self);
#endif #endif
deallocated(self); deallocated(self);
Py_XDECREF(self->cache);
Py_DECREF(self->ob_type); Py_DECREF(self->ob_type);
PyObject_DEL(self); PyObject_DEL(self);
} }
...@@ -724,7 +723,7 @@ Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v) ...@@ -724,7 +723,7 @@ Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v)
else PyErr_SetObject(PyExc_AttributeError, oname); else PyErr_SetObject(PyExc_AttributeError, oname);
} }
else else
return _setattro(self,oname, v, PyExtensionClassCAPI->setattro); return _setattro(self, oname, v, PyExtensionClassCAPI->setattro);
if (m) if (m)
{ {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.65 2002/10/16 16:12:48 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.66 2003/04/01 16:08:14 jeremy Exp $\n";
#include "cPersistence.h" #include "cPersistence.h"
...@@ -434,7 +434,6 @@ Per_dealloc(cPersistentObject *self) ...@@ -434,7 +434,6 @@ Per_dealloc(cPersistentObject *self)
if (idebug_log < 0) call_debug("del",self); if (idebug_log < 0) call_debug("del",self);
#endif #endif
deallocated(self); deallocated(self);
Py_XDECREF(self->cache);
Py_DECREF(self->ob_type); Py_DECREF(self->ob_type);
PyObject_DEL(self); PyObject_DEL(self);
} }
...@@ -724,7 +723,7 @@ Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v) ...@@ -724,7 +723,7 @@ Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v)
else PyErr_SetObject(PyExc_AttributeError, oname); else PyErr_SetObject(PyExc_AttributeError, oname);
} }
else else
return _setattro(self,oname, v, PyExtensionClassCAPI->setattro); return _setattro(self, oname, v, PyExtensionClassCAPI->setattro);
if (m) if (m)
{ {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
static char cPersistence_doc_string[] = static char cPersistence_doc_string[] =
"Defines Persistent mixin class for persistent objects.\n" "Defines Persistent mixin class for persistent objects.\n"
"\n" "\n"
"$Id: cPersistence.c,v 1.65 2002/10/16 16:12:48 jeremy Exp $\n"; "$Id: cPersistence.c,v 1.66 2003/04/01 16:08:14 jeremy Exp $\n";
#include "cPersistence.h" #include "cPersistence.h"
...@@ -434,7 +434,6 @@ Per_dealloc(cPersistentObject *self) ...@@ -434,7 +434,6 @@ Per_dealloc(cPersistentObject *self)
if (idebug_log < 0) call_debug("del",self); if (idebug_log < 0) call_debug("del",self);
#endif #endif
deallocated(self); deallocated(self);
Py_XDECREF(self->cache);
Py_DECREF(self->ob_type); Py_DECREF(self->ob_type);
PyObject_DEL(self); PyObject_DEL(self);
} }
...@@ -724,7 +723,7 @@ Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v) ...@@ -724,7 +723,7 @@ Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v)
else PyErr_SetObject(PyExc_AttributeError, oname); else PyErr_SetObject(PyExc_AttributeError, oname);
} }
else else
return _setattro(self,oname, v, PyExtensionClassCAPI->setattro); return _setattro(self, oname, v, PyExtensionClassCAPI->setattro);
if (m) if (m)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment