[Zope3-checkins] CVS: ZODB/src/ZODB - fstools.py:1.3

[Christian Reis]

Update of /cvs-repository/ZODB/src/ZODB
In directory cvs.zope.org:/tmp/cvs-serv31160

Modified Files:
	fstools.py 
Log Message:
Change TxnHeader._read_header according to format changes for length in
TRANS_HDR; also fix an import issue deriving from the creation of
ZODB.FileStorage.format. Problem pointed out by Martijn Faassen
<faassen at infrae.com>. r=jeremy


=== ZODB/src/ZODB/fstools.py 1.2 => 1.3 ===
--- ZODB/src/ZODB/fstools.py:1.2	Fri Nov 28 11:44:49 2003
+++ ZODB/src/ZODB/fstools.py	Wed Feb 25 15:40:54 2004
@@ -21,7 +21,7 @@
 import cPickle
 import struct
 
-from ZODB.FileStorage import TRANS_HDR, DATA_HDR, TRANS_HDR_LEN, \
+from ZODB.FileStorage.format import TRANS_HDR, DATA_HDR, TRANS_HDR_LEN, \
      DATA_HDR_LEN, DATA_VERSION_HDR_LEN
 from ZODB.utils import p64, u64
 from persistent.TimeStamp import TimeStamp
@@ -47,9 +47,8 @@
     def _read_header(self):
         self._file.seek(self._pos)
         self._hdr = self._file.read(TRANS_HDR_LEN)
-        (self.tid, length, self.status, self.user_len, self.descr_len,
+        (self.tid, self.length, self.status, self.user_len, self.descr_len,
          self.ext_len) = struct.unpack(TRANS_HDR, self._hdr)
-        self.length = u64(length)
 
     def read_meta(self):
         """Load user, descr, and ext attributes."""