[Zope-CVS] CVS: Products/AdaptableStorage/zodb - ASConnection.py:1.12.2.6 ASStorage.py:1.9.2.4 RemainingState.py:1.2.2.6 consts.py:1.4.2.5 utils.py:1.1.2.6

[Christian Zagrodnick]

Update of /cvs-repository/Products/AdaptableStorage/zodb
In directory cvs.zope.org:/tmp/cvs-serv14413/zodb

Modified Files:
      Tag: zagy-patches
	ASConnection.py ASStorage.py RemainingState.py consts.py 
	utils.py 
Log Message:
merging HEAD into zagy-patches branch

=== Products/AdaptableStorage/zodb/ASConnection.py 1.12.2.5 => 1.12.2.6 ===
--- Products/AdaptableStorage/zodb/ASConnection.py:1.12.2.5	Tue Feb  4 12:29:52 2003
+++ Products/AdaptableStorage/zodb/ASConnection.py	Thu Feb  6 08:01:17 2003
@@ -19,11 +19,15 @@
 import sys
 from time import time
 from types import StringType, TupleType
+from cStringIO import StringIO
+from cPickle import Unpickler, Pickler
 
-from ZODB import Persistent
-from ZODB.Connection import Connection, StringIO, Unpickler, Pickler, \
-     ConflictError, ReadConflictError, LOG, ERROR
 from Acquisition import aq_base
+from ZODB import Persistent
+from ZODB.POSException \
+     import ConflictError, ReadConflictError, InvalidObjectReference
+from ZODB.Connection import Connection
+from zLOG import LOG, ERROR
 
 from consts import SERIAL0, DEBUG
 from mapper_public import IKeyedObjectSystem, SerializationEvent, \
@@ -248,7 +252,10 @@
                         ext_oid = oid_encoder.encode(ext_keychain)
                         if ext_ref._p_jar:
                             if ext_ref._p_jar != self:
-                                raise InvalidObjectReference
+                                raise InvalidObjectReference, (
+                                    "Can't refer from %s in %s to %s in %s"
+                                    % (repr(object), repr(self), repr(ext_ref),
+                                       repr(ext_ref._p_jar)))
                         else:
                             ext_ref._p_jar = self
                         if ext_ref._p_oid:


=== Products/AdaptableStorage/zodb/ASStorage.py 1.9.2.3 => 1.9.2.4 ===


=== Products/AdaptableStorage/zodb/RemainingState.py 1.2.2.5 => 1.2.2.6 ===


=== Products/AdaptableStorage/zodb/consts.py 1.4.2.4 => 1.4.2.5 ===


=== Products/AdaptableStorage/zodb/utils.py 1.1.2.5 => 1.1.2.6 ===