[Zodb-checkins] CVS: Packages/ZODB - cPickleCache.c:1.85.6.6

[Tim Peters]

Update of /cvs-repository/Packages/ZODB
In directory cvs.zope.org:/tmp/cvs-serv25842/ZODB

Modified Files:
      Tag: Zope-2_7-branch
	cPickleCache.c 
Log Message:
Change the exception raised when an attempt is made to add two objects to
the cache with the same oid.  The former messsage didn't make sense.

Add a test to verify that this exception does get raised, and that the
message given is the intended one.

This is the first of a series of checkins, to fix critical bugs where
ZODB can in fact raise this exception in rare, but normal, use cases.


=== Packages/ZODB/cPickleCache.c 1.85.6.5 => 1.85.6.6 ===
--- Packages/ZODB/cPickleCache.c:1.85.6.5	Wed May 19 16:24:36 2004
+++ Packages/ZODB/cPickleCache.c	Thu Feb 24 14:59:04 2005
@@ -796,7 +796,7 @@
     if (object_again) {
 	if (object_again != v) {
 	    PyErr_SetString(PyExc_ValueError,
-		    "Can not re-register object under a different oid");
+		    "A different object already has the same oid");
 	    return -1;
 	} else {
 	    /* re-register under the same oid - no work needed */