[Zope-Checkins] CVS: ZODB3/ZODB - fspack.py:1.8.6.3

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv7206

Modified Files:
      Tag: ZODB3-3_2-branch
	fspack.py 
Log Message:
Replace use of undefined _fmt_oid() with oid_repr().


=== ZODB3/ZODB/fspack.py 1.8.6.2 => 1.8.6.3 ===
--- ZODB3/ZODB/fspack.py:1.8.6.2	Thu Jul  3 11:35:35 2003
+++ ZODB3/ZODB/fspack.py	Mon Sep  8 22:40:35 2003
@@ -33,7 +33,7 @@
 from types import StringType
 
 from ZODB.referencesf import referencesf
-from ZODB.utils import p64, u64, z64
+from ZODB.utils import p64, u64, z64, oid_repr
 from zLOG import LOG, BLATHER, WARNING, ERROR, PANIC
 
 try:
@@ -54,7 +54,7 @@
 
     def __str__(self):
         if self.oid:
-            msg = "Error reading oid %s.  Found %r" % (_fmt_oid(self.oid),
+            msg = "Error reading oid %s.  Found %r" % (oid_repr(self.oid),
                                                        self.buf)
         else:
             msg = "Error reading unknown oid.  Found %r" % self.buf
@@ -166,7 +166,7 @@
     def checkTxn(self, th, pos):
         if th.tid <= self.ltid:
             self.fail(pos, "time-stamp reduction: %s <= %s",
-                      _fmt_oid(th.tid), _fmt_oid(self.ltid))
+                      oid_repr(th.tid), oid_repr(self.ltid))
         self.ltid = th.tid
         if th.status == "c":
             self.fail(pos, "transaction with checkpoint flag set")