[Zope3-checkins] CVS: Zope3/src/zope/app/container - _zope_app_container_contained.c:1.2.10.5

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zope/app/container
In directory cvs.zope.org:/tmp/cvs-serv27409

Modified Files:
      Tag: zope3-zodb3-devel-branch
	_zope_app_container_contained.c 
Log Message:
Fix references to the C persistent type.


=== Zope3/src/zope/app/container/_zope_app_container_contained.c 1.2.10.4 => 1.2.10.5 ===
--- Zope3/src/zope/app/container/_zope_app_container_contained.c:1.2.10.4	Fri Jan 30 11:31:27 2004
+++ Zope3/src/zope/app/container/_zope_app_container_contained.c	Thu Feb 12 13:23:32 2004
@@ -94,7 +94,7 @@
 
   if (SPECIAL(cname))
     /* delegate to persistent */
-    return cPersistenceType->tp_getattro(self, name);
+    return cPersistenceCAPI->pertype->tp_getattro(self, name);
 
   /* Use the wrapper version to delegate */
   return wrap_getattro(self, name);
@@ -111,7 +111,7 @@
 
   if (SPECIAL(cname))
     /* delegate to persistent */
-    return cPersistenceType->tp_setattro(self, name, v);
+    return cPersistenceCAPI->pertype->tp_setattro(self, name, v);
 
   /* Use the wrapper version to delegate */
   return wrap_setattro(self, name, v);
@@ -180,7 +180,7 @@
 {
   PyObject *result;
 
-  result = PyObject_CallMethodObjArgs(OBJECT(cPersistenceType), 
+  result = PyObject_CallMethodObjArgs(OBJECT(cPersistenceCAPI->pertype), 
                                       str_p_deactivate,
                                       self, NULL);
   if (result == NULL)
@@ -230,7 +230,7 @@
 static int
 CP_traverse(ProxyObject *self, visitproc visit, void *arg)
 {
-  if (cPersistenceType->tp_traverse((PyObject *)self, visit, arg) < 0)
+  if (cPersistenceCAPI->pertype->tp_traverse((PyObject *)self, visit, arg) < 0)
     return -1;
   if (self->po_serial != NULL && visit(self->po_serial, arg) < 0)
     return -1;
@@ -255,8 +255,8 @@
      collector will call this method if it detects that this
      object is involved in a reference cycle.
   */
-  if (cPersistenceType->tp_clear != NULL)
-    cPersistenceType->tp_clear((PyObject*)self);
+  if (cPersistenceCAPI->pertype->tp_clear != NULL)
+    cPersistenceCAPI->pertype->tp_clear((PyObject*)self);
   
   CLEAR(self->po_serial);
   CLEAR(self->proxy_object);
@@ -277,7 +277,7 @@
   CLEAR(self->__parent__);
   CLEAR(self->__name__);
 
-  cPersistenceType->tp_dealloc((PyObject*)self);
+  cPersistenceCAPI->pertype->tp_dealloc((PyObject*)self);
 }
 
 #ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
@@ -311,7 +311,7 @@
 
   ProxyType.tp_name = "zope.app.container.contained.ContainedProxyBase";
   ProxyType.ob_type = &PyType_Type;
-  ProxyType.tp_base = cPersistenceType;
+  ProxyType.tp_base = cPersistenceCAPI->pertype;
   ProxyType.tp_getattro = CP_getattro;
   ProxyType.tp_setattro = CP_setattro;
   ProxyType.tp_members = CP_members;