[Zope3-checkins] CVS: Zope3/lib/python/ZODB - ConflictResolution.py:1.21

[Guido van Rossum]

Update of /cvs-repository/Zope3/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv5878

Modified Files:
	ConflictResolution.py 
Log Message:
Convert to logging module.


=== Zope3/lib/python/ZODB/ConflictResolution.py 1.20 => 1.21 ===
--- Zope3/lib/python/ZODB/ConflictResolution.py:1.20	Fri Dec 13 12:13:26 2002
+++ Zope3/lib/python/ZODB/ConflictResolution.py	Thu Dec 19 16:51:36 2002
@@ -20,7 +20,7 @@
 
 from cStringIO import StringIO
 from cPickle import PicklingError
-import zLOG
+import logging
 
 from Transaction.Exceptions import ConflictError
 from ZODB.Serialize import BaseObjectReader, ObjectWriter, getClassMetadata
@@ -131,14 +131,14 @@
         try:
             old = reader.getState(p)
         except (EOFError, PicklingError), err:
-            zLOG.LOG("CR", zLOG.INFO, "Error loading object: %s" % err)
+            logging.warn("CR: 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)
+            logging.warn("CR: Error loading object: %s", err)
             return None
         try:
             resolved = resolve(old, committed, newstate)