.

go/zodb/btree/btree.go

@@ -316,10 +316,17 @@ func (b *Bucket) PySetState(pystate interface{}) error {
 
 // ---- register classes to ZODB ----
 
-func bucketNew(base *zodb.PyPersistent) zodb.IPyPersistent	{ return &Bucket{PyPersistent: base}	}
-func btreeNew(base *zodb.PyPersistent) zodb.IPyPersistent	{ return &BTree{PyPersistent: base}	}
+func bucketNew(base *zodb.Persistent) zodb.IPersistent {
+	// XXX simplify vvv
+	return &Bucket{PyPersistent: &zodb.PyPersistent{Persistent: base}}
+}
+
+func btreeNew(base *zodb.Persistent) zodb.IPersistent {
+	// XXX simplify vvv
+	return &BTree{PyPersistent: &zodb.PyPersistent{Persistent: base}}
+}
 
 func init() {
-	zodb.PyRegisterClass("zodb.BTree.LOBucket", bucketNew)
-	zodb.PyRegisterClass("zodb.BTree.LOBtree",  btreeNew)
+	zodb.RegisterClass("zodb.BTree.LOBucket", bucketNew)
+	zodb.RegisterClass("zodb.BTree.LOBtree",  btreeNew)
 }

go/zodb/zodbpy.go

@@ -25,6 +25,7 @@ import (
 )
 
 // IPyPersistent is the interface that every in-RAM object representing Python ZODB object implements.
+// XXX kill
 type IPyPersistent interface {
 	IPersistent
 
@@ -40,8 +41,8 @@ type IPyPersistent interface {
 
 // PyPersistent is common base implementation for in-RAM representation of ZODB Python objects.
 type PyPersistent struct {
-	Persistent
-	pyclass pickle.Class
+	*Persistent		// XXX remove ptr
+	pyclass pickle.Class	// XXX kill
 }
 
 //func (pyobj *PyPersistent) PyClass() pickle.Class	{ return pyobj.pyclass	}