[Zodb-checkins] CVS: Zope3/lib/python/ZEO - StorageServer.py:1.47

Guido van Rossum guido@python.org
Thu, 19 Dec 2002 16:18:21 -0500


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

Modified Files:
	StorageServer.py 
Log Message:
Replace some repr() calls with %r formats.

Fix typo: self.error() should be self.logger.error().


=== Zope3/lib/python/ZEO/StorageServer.py 1.46 => 1.47 ===
--- Zope3/lib/python/ZEO/StorageServer.py:1.46	Thu Dec 19 15:22:43 2002
+++ Zope3/lib/python/ZEO/StorageServer.py	Thu Dec 19 16:18:21 2002
@@ -268,9 +268,8 @@
             else:
                 return 0
         if self.transaction.id != tid:
-            self.logger.error("%s: %s(%s) invalid; current transaction = %s",
-                              self.log_label,
-                              caller, repr(tid), repr(self.transaction.id))
+            self.logger.error("%s: %s(%r) invalid; current transaction = %r",
+                              self.log_label, caller, tid, self.transaction.id)
             if exc is not None:
                 raise exc(self.transaction.id, tid)
             else:
@@ -642,7 +641,7 @@
                 pickler.dump(err, 1)
             except:
                 msg = "Couldn't pickle storage exception: %s" % repr(err)
-                self.error(msg)
+                self.logger.error(msg)
                 err = StorageServerError(msg)
             # The exception is reported back as newserial for this oid
             newserial = err