Commit c2eb4054 authored by Jeremy Hylton's avatar Jeremy Hylton

Add loadEx definition.

parent e1879ea8
...@@ -17,10 +17,10 @@ MappingStorage. Unlike MappingStorage, it needs not be packed to get rid of ...@@ -17,10 +17,10 @@ MappingStorage. Unlike MappingStorage, it needs not be packed to get rid of
non-cyclic garbage and it does rudimentary conflict resolution. This is a non-cyclic garbage and it does rudimentary conflict resolution. This is a
ripoff of Jim's Packless bsddb3 storage. 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 zLOG import LOG, BLATHER
from ZODB.referencesf import referencesf from ZODB.referencesf import referencesf
...@@ -97,6 +97,10 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage): ...@@ -97,6 +97,10 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
finally: finally:
self._lock_release() self._lock_release()
def loadEx(self, oid, version):
p, s = self.load(oid, version)
return p, s, s
def loadSerial(self, oid, serial, marker=[]): def loadSerial(self, oid, serial, marker=[]):
""" this is only useful to make conflict resolution work. It """ this is only useful to make conflict resolution work. It
does not actually implement all the semantics that a revisioning does not actually implement all the semantics that a revisioning
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment