Added updated copt with wrapper checking to the trunk

src/ZODB/coptimizations.c

@@ -163,6 +163,18 @@ persistent_id_call(persistent_id *self, PyObject *args, PyObject *kwargs)
 		 & PERSISTENT_TYPE_FLAG)
 		)
 	  goto not_persistent;
+
+	if (OBJECT(object->ob_type) != klass)
+	  {			/* Wrapped object, whine! */
+	    /*
+	    printf("%s != %s\n", 
+		   object->ob_type->tp_name,
+		   (((PyExtensionClass*)klass)->tp_name));
+	    */
+	    PyErr_SetString(InvalidObjectReference, 
+			    "Attempt to store a wrapped persistent object");
+	    return NULL;
+	  }
       }
     else 
       goto not_persistent;
@@ -307,7 +319,7 @@ void
 initcoptimizations()
 {
   PyObject *m, *d;
-  char *rev="$Revision: 1.6 $";
+  char *rev="$Revision: 1.7 $";
 
 #define make_string(S) if (! (py_ ## S=PyString_FromString(#S))) return
   make_string(_p_oid);