[Zope3-checkins] CVS: Zope3/src/zodb/storage - file.py:1.1.2.3

[Barry Warsaw]

Update of /cvs-repository/Zope3/src/zodb/storage
In directory cvs.zope.org:/tmp/cvs-serv17175

Modified Files:
      Tag: NameGeddon-branch
	file.py 
Log Message:
Deunblorkifistration


=== Zope3/src/zodb/storage/file.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/file.py:1.1.2.2	Mon Dec 23 16:52:52 2002
+++ Zope3/src/zodb/storage/file.py	Mon Dec 23 17:08:37 2002
@@ -134,7 +134,9 @@
     fsync = None
 
 import zodb.db
-from zodb import BaseStorage, ConflictResolution, interfaces
+from zodb.storage import base
+from zodb import conflict
+from zodb import interfaces
 from zodb.interfaces import UndoError, POSKeyError, MultipleUndoErrors
 from zodb.serialize import findrefs
 from zodb.timestamp import TimeStamp, newTimeStamp, timeStampFromTime
@@ -272,9 +274,9 @@
         # seek to transaction header, where tid is first 8 bytes
         return self._file.read(8)
 
-class FileStorage(BaseStorage.BaseStorage,
+class FileStorage(base.BaseStorage,
                   FileStorageFormatter,
-                  ConflictResolution.ConflictResolvingStorage):
+                  conflict.ConflictResolvingStorage):
     # default pack time is 0
     _packt = z64
 
@@ -654,7 +656,7 @@
                 raise FileStorageQuotaError("storage quota exceeded")
 
             if old and serial != h.serial:
-                return ConflictResolution.ResolvedSerial
+                return conflict.ResolvedSerial
             else:
                 return self._serial
 
@@ -2191,8 +2193,7 @@
 
         raise IndexError, index
 
-class RecordIterator(Iterator, FileStorageFormatter,
-                     BaseStorage.TransactionRecord):
+class RecordIterator(Iterator, FileStorageFormatter, base.TransactionRecord):
     """Iterate over the transactions in a FileStorage file."""
     
     def __init__(self, tid, status, user, desc, ext, pos, tend, file, tpos):
@@ -2241,7 +2242,7 @@
 
         raise IndexError, index
 
-class Record(BaseStorage.DataRecord):
+class Record(base.DataRecord):
     """An abstract database record."""
     def __init__(self, *args):
         self.oid, self.serial, self.version, self.data, self.data_txn = args