Skip to content

Commit

Permalink
Minimal edits to track change of BaseStorage._serial to
Browse files Browse the repository at this point in the history
BaseStorage._tid.
  • Loading branch information
Jeremy Hylton committed Dec 24, 2003
1 parent 0318bf6 commit e1879ea
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions TemporaryStorage.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
non-cyclic garbage and it does rudimentary conflict resolution. This is a
ripoff of Jim's Packless bsddb3 storage.
$Id: TemporaryStorage.py,v 1.2 2003/11/28 16:46:50 jim Exp $
$Id: TemporaryStorage.py,v 1.3 2003/12/24 16:42:22 jeremy Exp $
"""

__version__ ='$Revision: 1.2 $'[11:-2]
__version__ ='$Revision: 1.3 $'[11:-2]

from zLOG import LOG, BLATHER
from ZODB.referencesf import referencesf
Expand Down Expand Up @@ -137,7 +137,7 @@ def store(self, oid, serial, data, version, transaction):
data = rdata
else:
oserial = serial
newserial=self._serial
newserial=self._tid
self._tmp.append((oid, data))
now = time.time()
self._conflict_cache[(oid, newserial)] = data, now
Expand All @@ -150,7 +150,7 @@ def _finish(self, tid, u, d, e):
referenceCount=self._referenceCount
referenceCount_get=referenceCount.get
oreferences=self._oreferences
serial=self._serial
serial=self._tid
index=self._index
opickle=self._opickle

Expand Down

0 comments on commit e1879ea

Please sign in to comment.