diff --git a/src/ZEO/ClientStorage.py b/src/ZEO/ClientStorage.py index 7b02bd15c..5a722c067 100644 --- a/src/ZEO/ClientStorage.py +++ b/src/ZEO/ClientStorage.py @@ -490,7 +490,7 @@ def record_iternext(self, next=None): return self._call('record_iternext', next) def getTid(self, oid): - # XXX deprecated: used by storage server for full cache verification. + # XXX deprecated: but ZODB tests use this. They shouldn't return self._call('getTid', oid) def loadSerial(self, oid, serial): diff --git a/src/ZEO/StorageServer.py b/src/ZEO/StorageServer.py index e13e81d1c..7439d34a6 100644 --- a/src/ZEO/StorageServer.py +++ b/src/ZEO/StorageServer.py @@ -140,7 +140,9 @@ def setup_delegation(self): if not info['supportsUndo']: self.undoLog = self.undoInfo = lambda *a,**k: () + # XXX deprecated: but ZODB tests use getTid. They shouldn't self.getTid = storage.getTid + self.load = storage.load self.loadSerial = storage.loadSerial record_iternext = getattr(storage, 'record_iternext', None) diff --git a/src/ZEO/interfaces.py b/src/ZEO/interfaces.py index 83e48114a..ca9a7c663 100644 --- a/src/ZEO/interfaces.py +++ b/src/ZEO/interfaces.py @@ -90,14 +90,6 @@ class IServeable(zope.interface.Interface): """Interface provided by storages that can be served by ZEO """ - def getTid(oid): - """The last transaction to change an object - - Return the transaction id of the last transaction that committed a - change to an object with the given object id. - - """ - def tpc_transaction(): """The current transaction being committed.