From c2eb40545b61ccd9ed963adac1b4440135d6ecd2 Mon Sep 17 00:00:00 2001 From: Jeremy Hylton Date: Wed, 24 Dec 2003 16:46:15 +0000 Subject: [PATCH] Add loadEx definition. --- TemporaryStorage.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/TemporaryStorage.py b/TemporaryStorage.py index 0f862d7..35caea8 100755 --- a/TemporaryStorage.py +++ b/TemporaryStorage.py @@ -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 @@ -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