[Zodb-checkins] CVS: Zope3/src/zodb/storage - bdbfull.py:1.20

[Barry Warsaw]

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

Modified Files:
	bdbfull.py 
Log Message:
Remove an unused import.

_doabort(): Initialize a local.


=== Zope3/src/zodb/storage/bdbfull.py 1.19 => 1.20 ===
--- Zope3/src/zodb/storage/bdbfull.py:1.19	Mon Mar 17 15:22:39 2003
+++ Zope3/src/zodb/storage/bdbfull.py	Thu Mar 20 17:54:52 2003
@@ -25,7 +25,7 @@
 from zodb.storage.interfaces import *
 from zodb.utils import p64, u64
 from zodb.timestamp import TimeStamp
-from zodb.conflict import ConflictResolver, ResolvedSerial
+from zodb.conflict import ResolvedSerial
 from zodb.interfaces import ITransactionAttrs
 from zodb.storage.interfaces import StorageSystemError
 from zodb.storage.base import db, BerkeleyBase, PackStop, _WorkThread, \
@@ -302,7 +302,7 @@
 
     def _doabort(self, txn, tid):
         # First clean up the oid indexed (or oid+tid indexed) tables.
-        co = cs = ct = cv = None
+        co = cs = ct = cv = cr = None
         try:
             co = self._oids.cursor(txn=txn)
             cs = self._serials.cursor(txn=txn)
@@ -948,7 +948,8 @@
             if vid == ZERO or self._versions.get(vid) == version:
                 return self._pickles[oid+lrevid], serial
             # The object was living in a version, but not the one requested.
-            # Semantics here are to return the non-version revision.
+            # Semantics here are to return the non-version revision.  Allow
+            # KeyErrors to percolate up (meaning there's no non-version rev).
             lrevid = self._metadata[oid+nvrevid][16:24]
             return self._pickles[oid+lrevid], nvrevid
         finally: