[Zope-Checkins] CVS: ZODB3/ZODB/FileStorage - FileStorage.py:1.1.2.18

Tim Peters cvs-admin at zope.org
Mon Dec 1 10:16:44 EST 2003


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

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	FileStorage.py 
Log Message:
Whitespace normalization.


=== ZODB3/ZODB/FileStorage/FileStorage.py 1.1.2.17 => 1.1.2.18 ===
--- ZODB3/ZODB/FileStorage/FileStorage.py:1.1.2.17	Tue Nov 25 12:00:30 2003
+++ ZODB3/ZODB/FileStorage/FileStorage.py	Mon Dec  1 10:16:10 2003
@@ -106,7 +106,7 @@
 class FileStorage(BaseStorage.BaseStorage,
                   ConflictResolution.ConflictResolvingStorage,
                   FileStorageFormatter):
-    
+
     # default pack time is 0
     _packt = z64
 
@@ -794,7 +794,7 @@
                 dlen = 0
             else:
                 dlen = len(data)
-                
+
             # Write the recovery data record
             new = DataHeader(oid, serial, old, self._pos, len(version), dlen)
             if version:
@@ -807,9 +807,9 @@
                 self._toid2serial_delete[oid] = 1
             else:
                 self._toid2serial[oid] = serial
-                
+
             self._tfile.write(new.asString())
-            
+
             # Finally, write the data or a backpointer.
             if data is None:
                 if prev_pos:
@@ -885,7 +885,7 @@
                 return # No data in this trans
             self._tfile.seek(0)
             user, descr, ext = self._ude
-            
+
             self._file.seek(self._pos)
             tl = self._thl + dlen
 
@@ -1017,7 +1017,7 @@
         tpos = self._tindex.get(oid, 0)
         ipos = self._index.get(oid, 0)
         tipos = tpos or ipos
-        
+
         if tipos != pos:
             # Eek, a later transaction modified the data, but,
             # maybe it is pointing at the same data we are.
@@ -1169,8 +1169,8 @@
         pos = tpos + th.headerlen()
         tindex = {}
 
-        # keep track of failures, cause we may succeed later        
-        failures = {} 
+        # keep track of failures, cause we may succeed later
+        failures = {}
         # Read the data records for this transaction
         while pos < tend:
             h = self._read_data_header(pos)
@@ -1862,7 +1862,7 @@
                 if not err.buf:
                     break
                 raise
-            
+
             if h.tid <= self._ltid:
                 warn("%s time-stamp reduction at %s", self._file.name, pos)
             self._ltid = h.tid




More information about the Zope-Checkins mailing list