[Zodb-checkins] CVS: ZODB4/ZODB - ConflictResolution.py:1.20

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/ZODB
In directory cvs.zope.org:/tmp/cvs-serv14467

Modified Files:
	ConflictResolution.py 
Log Message:
Remove unused import.  Log error message in conflict resolution.


=== ZODB4/ZODB/ConflictResolution.py 1.19 => 1.20 ===
--- ZODB4/ZODB/ConflictResolution.py:1.19	Wed Dec  4 16:58:49 2002
+++ ZODB4/ZODB/ConflictResolution.py	Fri Dec 13 12:13:26 2002
@@ -19,7 +19,8 @@
 __metaclass__ = type
 
 from cStringIO import StringIO
-from cPickle import Pickler, PicklingError
+from cPickle import PicklingError
+import zLOG
 
 from Transaction.Exceptions import ConflictError
 from ZODB.Serialize import BaseObjectReader, ObjectWriter, getClassMetadata
@@ -130,12 +131,14 @@
         try:
             old = reader.getState(p)
         except (EOFError, PicklingError), err:
+            zLOG.LOG("CR", zLOG.INFO, "Error loading object: %s" % err)
             return None
         if committedData is None:
             committedData = self.loadSerial(oid, committedSerial)
         try:
             committed = reader.getState(committedData)
         except (EOFError, PicklingError), err:
+            zLOG.LOG("CR", zLOG.INFO, "Error loading object: %s" % err)
             return None
         try:
             resolved = resolve(old, committed, newstate)