[Zope3-checkins] CVS: Zope3/lib/python/Persistence/BTrees - BTreeModuleTemplate.c:1.13 BTreeTemplate.c:1.45 BucketTemplate.c:1.20

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Persistence/BTrees
In directory cvs.zope.org:/tmp/cvs-serv8043/lib/python/Persistence/BTrees

Modified Files:
	BTreeModuleTemplate.c BTreeTemplate.c BucketTemplate.c 
Log Message:
Backed out a bunch of persistence changes checkin in last night that
broke things badly. Unit tests failed and zope wouldn't start under
either Python 2.2.1 or the Python CVS head. Aaaargh.


=== Zope3/lib/python/Persistence/BTrees/BTreeModuleTemplate.c 1.12 => 1.13 ===
--- Zope3/lib/python/Persistence/BTrees/BTreeModuleTemplate.c:1.12	Wed Oct  9 18:41:32 2002
+++ Zope3/lib/python/Persistence/BTrees/BTreeModuleTemplate.c	Thu Oct 10 04:20:07 2002
@@ -394,7 +394,7 @@
 init_persist_type(PyTypeObject *type)
 {
     type->ob_type = &PyType_Type;
-    type->tp_base = PyPersist_TYPE;
+    type->tp_base = PyPersist_BASE_TYPE;
 
     if (PyType_Ready(type) < 0)
 	return 0;


=== Zope3/lib/python/Persistence/BTrees/BTreeTemplate.c 1.44 => 1.45 ===
--- Zope3/lib/python/Persistence/BTrees/BTreeTemplate.c:1.44	Wed Oct  9 18:41:32 2002
+++ Zope3/lib/python/Persistence/BTrees/BTreeTemplate.c	Thu Oct 10 04:20:07 2002
@@ -1825,7 +1825,7 @@
     if (self->ob_type == &BTreeType)
 	assert(self->ob_type->tp_dictoffset == 0);
 
-    err = PyPersist_TYPE->tp_traverse((PyObject *)self, visit, arg);
+    err = PyPersist_BASE_TYPE->tp_traverse((PyObject *)self, visit, arg);
     if (err)
 	goto Done;
 
@@ -1861,7 +1861,7 @@
 static int
 BTree_tp_clear(BTree *self)
 {
-    PyPersist_TYPE->tp_clear((PyObject *)self);
+    PyPersist_BASE_TYPE->tp_clear((PyObject *)self);
     if (self->po_state != GHOST)
 	_BTree_clear(self);
     return 0;


=== Zope3/lib/python/Persistence/BTrees/BucketTemplate.c 1.19 => 1.20 ===
--- Zope3/lib/python/Persistence/BTrees/BucketTemplate.c:1.19	Wed Oct  9 18:41:32 2002
+++ Zope3/lib/python/Persistence/BTrees/BucketTemplate.c	Thu Oct 10 04:20:07 2002
@@ -1455,7 +1455,7 @@
     if (self->ob_type == &BucketType)
 	assert(self->ob_type->tp_dictoffset == 0);
 
-    err = PyPersist_TYPE->tp_traverse((PyObject *)self, visit, arg);
+    err = PyPersist_BASE_TYPE->tp_traverse((PyObject *)self, visit, arg);
     if (err)
 	goto Done;
 
@@ -1496,7 +1496,7 @@
 int
 bucket_tp_clear(Bucket *self)
 {
-    PyPersist_TYPE->tp_clear((PyObject *)self);
+    PyPersist_BASE_TYPE->tp_clear((PyObject *)self);
     if (self->po_state != GHOST)
 	_bucket_clear(self);
     return 0;