[Zodb-checkins] CVS: ZODB3/ZODB - ConflictResolution.py:1.18.36.2 Connection.py:1.98.6.11 FileStorage.py:1.135.8.5 Transaction.py:1.49.6.3 fspack.py:1.8.10.2 fsrecover.py:1.12.8.3

[Jeremy Hylton]

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

Modified Files:
      Tag: zodb33-devel-branch
	ConflictResolution.py Connection.py FileStorage.py 
	Transaction.py fspack.py fsrecover.py 
Log Message:
Remove unused imports and local variables.


=== ZODB3/ZODB/ConflictResolution.py 1.18.36.1 => 1.18.36.2 ===
--- ZODB3/ZODB/ConflictResolution.py:1.18.36.1	Tue Jul  8 18:14:21 2003
+++ ZODB3/ZODB/ConflictResolution.py	Tue Jul 15 14:02:57 2003
@@ -38,7 +38,7 @@
     file = StringIO(p)
     unpickler = Unpickler(file)
     unpickler.persistent_load = prfactory.persistent_load
-    class_tuple = unpickler.load()
+    unpickler.load() # ignore class tuple
     state = unpickler.load()
     return state
 


=== ZODB3/ZODB/Connection.py 1.98.6.10 => 1.98.6.11 ===
--- ZODB3/ZODB/Connection.py:1.98.6.10	Thu Jul 10 09:52:04 2003
+++ ZODB3/ZODB/Connection.py	Tue Jul 15 14:02:57 2003
@@ -352,7 +352,6 @@
         dbstore=self._storage.store
         file=file.getvalue
         cache=self._cache
-        get=cache.get
         dump=pickler.dump
         clear_memo=pickler.clear_memo
 
@@ -431,7 +430,6 @@
         load=src.load
         store=tmp.store
         dest=self._version
-        get=self._cache.get
         oids=src._index.keys()
 
         # Copy invalidating and creating info from temporary storage:


=== ZODB3/ZODB/FileStorage.py 1.135.8.4 => 1.135.8.5 ===
--- ZODB3/ZODB/FileStorage.py:1.135.8.4	Thu Jul  3 18:40:47 2003
+++ ZODB3/ZODB/FileStorage.py	Tue Jul 15 14:02:57 2003
@@ -2164,7 +2164,6 @@
             self._file.seek(pos)
             h = self._file.read(DATA_HDR_LEN)
             oid, serial, sprev, stloc, vlen, splen = unpack(DATA_HDR, h)
-            prev = u64(sprev)
             tloc = u64(stloc)
             plen = u64(splen)
             dlen = DATA_HDR_LEN + (plen or 8)
@@ -2172,7 +2171,6 @@
             if vlen:
                 dlen += (16 + vlen)
                 tmp = self._file.read(16)
-                pv = u64(tmp[8:16])
                 version = self._file.read(vlen)
             else:
                 version = ''


=== ZODB3/ZODB/Transaction.py 1.49.6.2 => 1.49.6.3 ===
--- ZODB3/ZODB/Transaction.py:1.49.6.2	Tue Jul  8 09:52:29 2003
+++ ZODB3/ZODB/Transaction.py	Tue Jul 15 14:02:57 2003
@@ -16,7 +16,8 @@
 $Id$
 """
 
-import time, sys, struct, POSException
+import sys
+import POSException
 from string import split, strip, join
 from zLOG import LOG, ERROR, PANIC, INFO, BLATHER, WARNING
 from POSException import ConflictError


=== ZODB3/ZODB/fspack.py 1.8.10.1 => 1.8.10.2 ===
--- ZODB3/ZODB/fspack.py:1.8.10.1	Tue Jul  1 16:57:18 2003
+++ ZODB3/ZODB/fspack.py	Tue Jul 15 14:02:57 2003
@@ -177,7 +177,6 @@
                       "txnlen (%d) < headerlen(%d)", th.tlen, th.headerlen())
 
     def checkData(self, th, tpos, dh, pos):
-        tend = tpos + th.tlen
         if dh.tloc != tpos:
             self.fail(pos, "data record does not point to transaction header"
                       ": %d != %d", dh.tloc, tpos)
@@ -346,7 +345,6 @@
         if not prev:
             return None
 
-        pnv = None
         h = self._read_data_header(prev, oid)
         # If the previous record is for a version, it must have
         # a valid pnv.
@@ -709,7 +707,6 @@
         return pos
 
     def copyToPacktime(self):
-        offset = 0L  # the amount of space freed by packing
         pos = self._metadata_size
         new_pos = pos
 
@@ -775,7 +772,6 @@
                 s = th.asString()
                 new_tpos = self._tfile.tell()
                 self._tfile.write(s)
-                new_pos = new_tpos + len(s)
                 copy = 1
 
             if h.plen:
@@ -787,7 +783,6 @@
                 data = self.fetchBackpointer(h.oid, h.back)
 
             self.writePackedDataRecord(h, data, new_tpos)
-            new_pos = self._tfile.tell()
 
         return new_tpos, pos
 


=== ZODB3/ZODB/fsrecover.py 1.12.8.2 => 1.12.8.3 ===
--- ZODB3/ZODB/fsrecover.py:1.12.8.2	Tue Jul  1 16:57:18 2003
+++ ZODB3/ZODB/fsrecover.py	Tue Jul 15 14:02:57 2003
@@ -323,8 +323,8 @@
                         l = len(r.data)
 
                     print "%7d %s %s" % (u64(r.oid), l, r.version)
-                s = ofs.restore(r.oid, r.serial, r.data, r.version,
-                                r.data_txn, txn)
+                ofs.restore(r.oid, r.serial, r.data, r.version, r.data_txn,
+                            txn)
                 nrec += 1
         except (KeyboardInterrupt, SystemExit):
             raise