[Zope-Checkins] CVS: Zope/lib/python/ZODB - BaseStorage.py:1.34.4.2 fspack.py:1.8.8.8

[Tim Peters]

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

Modified Files:
      Tag: Zope-2_7-branch
	BaseStorage.py fspack.py 
Log Message:
Collector #1261:  global name 'oid_repr' not defined

fspack.py and BaseStorage.copyTransactionsFrom():  these were missing
imports of the oid_repr() function, used to format msgs in unlikely
error cases.


=== Zope/lib/python/ZODB/BaseStorage.py 1.34.4.1 => 1.34.4.2 ===
--- Zope/lib/python/ZODB/BaseStorage.py:1.34.4.1	Mon Sep 15 14:02:58 2003
+++ Zope/lib/python/ZODB/BaseStorage.py	Thu May 13 15:50:45 2004
@@ -24,7 +24,7 @@
 from ZODB import POSException
 from ZODB.TimeStamp import TimeStamp
 from ZODB.UndoLogCompatible import UndoLogCompatible
-from ZODB.utils import z64
+from ZODB.utils import z64, oid_repr
 
 class BaseStorage(UndoLogCompatible):
     _transaction=None # Transaction that is being committed


=== Zope/lib/python/ZODB/fspack.py 1.8.8.7 => 1.8.8.8 ===
--- Zope/lib/python/ZODB/fspack.py:1.8.8.7	Sun Mar 14 10:59:03 2004
+++ Zope/lib/python/ZODB/fspack.py	Thu May 13 15:50:45 2004
@@ -28,7 +28,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, ERROR