[Checkins]
SVN: gocept.zeoraid/trunk/src/gocept/zeoraid/compatibility.py
apply ClientStorage compatibility adapter regardless of our
own ZODB version
Thomas Lotze
tl at gocept.com
Mon Jan 14 09:14:04 EST 2008
Log message for revision 82868:
apply ClientStorage compatibility adapter regardless of our own ZODB version
Changed:
U gocept.zeoraid/trunk/src/gocept/zeoraid/compatibility.py
-=-
Modified: gocept.zeoraid/trunk/src/gocept/zeoraid/compatibility.py
===================================================================
--- gocept.zeoraid/trunk/src/gocept/zeoraid/compatibility.py 2008-01-14 12:20:40 UTC (rev 82867)
+++ gocept.zeoraid/trunk/src/gocept/zeoraid/compatibility.py 2008-01-14 14:14:03 UTC (rev 82868)
@@ -9,6 +9,7 @@
import zope.proxy
import zope.proxy.decorator
+import ZODB.utils
import ZEO.ClientStorage
import gocept.zeoraid.interfaces
@@ -32,14 +33,12 @@
@zope.proxy.non_overridable
def lastTransaction(self):
- return zope.proxy.getProxiedObject(self)._server.lastTransaction()
+ lt = zope.proxy.getProxiedObject(self)._server.lastTransaction()
+ if lt is None:
+ lt = ZODB.utils.z64
+ return lt
-compatibility_matrix = {
- '3.8': ClientStorage38
-}
-
-
compatibility_initialized = False
@@ -47,9 +46,5 @@
global compatibility_initialized
if compatibility_initialized:
return
- zodb_version = gocept.zeoraid.utils.guess_zodb_version()
- gocept.zeoraid.utils.logger.info(
- 'Setting up compatibility layer for ZODB %s.' % zodb_version)
- storage_adapter = compatibility_matrix[zodb_version]
- zope.component.provideAdapter(storage_adapter)
+ zope.component.provideAdapter(ClientStorage38)
compatibility_initialized = True
More information about the Checkins
mailing list