Commit c7e99e3d authored by Jim Fulton's avatar Jim Fulton

Make method copying lazy

This allows us to not worry about method overriding and avoids
creating wrapper methods (some of which were broken).

My guess is that performance is a wash.  We take a tiny hit on the
first access, because ``__getattr__``, but we don't have to copy
methods we never use.
parent 44eac704
...@@ -16,40 +16,23 @@ class Base(object): ...@@ -16,40 +16,23 @@ class Base(object):
_copy_methods = ( _copy_methods = (
'getName', 'getSize', 'history', 'lastTransaction', 'sortKey', 'getName', 'getSize', 'history', 'lastTransaction', 'sortKey',
'loadBlob', 'openCommittedBlobFile', 'loadBlob', 'openCommittedBlobFile',
'isReadOnly', 'supportsUndo', 'undoLog', 'undoInfo',
'temporaryDirectory',
) )
def __init__(self, storage): def __init__(self, storage):
self._storage = storage self._storage = storage
for name in self._copy_methods:
if hasattr(self._storage, name):
setattr(self, name, getattr(storage, name))
if interfaces.IBlobStorage.providedBy(storage): if interfaces.IBlobStorage.providedBy(storage):
zope.interface.alsoProvides(self, interfaces.IBlobStorage) zope.interface.alsoProvides(self, interfaces.IBlobStorage)
def isReadOnly(self): def __getattr__(self, name):
return self._storage.isReadOnly() if name in self._copy_methods:
if hasattr(self._storage, name):
m = getattr(self._storage, name)
setattr(self, name, m)
return m
def supportsUndo(self): raise AttributeError(name)
try:
return self._storage.supportsUndo()
except AttributeError:
return False
def undoLog(self, first, last, filter=None):
try:
return self._storage.undoLog(first, last, filter)
except AttributeError:
return False
def undoInfo(self, first=0, last=20, specification=None):
try:
return self._storage.undoInfo(first, last, specification)
except AttributeError:
return False
def temporaryDirectory(self):
return self._storage.temporaryDirectory()
def __len__(): def __len__():
return len(self._storage) return len(self._storage)
...@@ -112,7 +95,7 @@ class MVCCAdapter(Base): ...@@ -112,7 +95,7 @@ class MVCCAdapter(Base):
class MVCCAdapterInstance(Base): class MVCCAdapterInstance(Base):
_copy_methods = Base._copy_methods + ( _copy_methods = Base._copy_methods + (
'isReadOnly', 'loadSerial', 'new_oid', 'tpc_vote', 'loadSerial', 'new_oid', 'tpc_vote',
'checkCurrentSerialInTransaction', 'tpc_abort', 'checkCurrentSerialInTransaction', 'tpc_abort',
) )
......
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