[Zodb-checkins] CVS: StandaloneZODB/ZODB - FileStorage.py:1.82

[Guido van Rossum]

Update of /cvs-repository/StandaloneZODB/ZODB
In directory cvs.zope.org:/tmp/cvs-serv19596

Modified Files:
	FileStorage.py 
Log Message:
Use fsIndex() for the index, if it exists.  This completes the merge
of the StandaloneZODB-1_0-branch into the trunk.  The
StandaloneZODB-1_0-branch is now dead!


=== StandaloneZODB/ZODB/FileStorage.py 1.81 => 1.82 ===
 import ConflictResolution
 
+try:
+    from fsIndex import fsIndex
+except ImportError:
+    def fsIndex():
+        return {}
+
 try: from posix import fsync
 except: fsync=None
 
@@ -1327,7 +1333,7 @@
     
             rootl=[z64]
             pop=rootl.pop
-            pindex={}
+            pindex=fsIndex()
             referenced=pindex.has_key
             _load=self._load
             _loada=self._loada
@@ -1357,7 +1363,7 @@
     
             # Index for non-version data.  This is a temporary structure
             # to reduce I/O during packing
-            nvindex={}
+            nvindex=fsIndex()
     
             # Cache a bunch of methods
             seek=file.seek