Skip to content

Commit

Permalink
Add loadEx definition.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy Hylton committed Dec 24, 2003
1 parent e1879ea commit c2eb405
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 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.3 2003/12/24 16:42:22 jeremy Exp $
$Id: TemporaryStorage.py,v 1.4 2003/12/24 16:46:15 jeremy Exp $
"""

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

from zLOG import LOG, BLATHER
from ZODB.referencesf import referencesf
Expand Down Expand Up @@ -97,6 +97,10 @@ def load(self, oid, version):
finally:
self._lock_release()

def loadEx(self, oid, version):
p, s = self.load(oid, version)
return p, s, s

def loadSerial(self, oid, serial, marker=[]):
""" this is only useful to make conflict resolution work. It
does not actually implement all the semantics that a revisioning
Expand Down

0 comments on commit c2eb405

Please sign in to comment.