[Neo-report] r2793 jm - in /trunk: ./ neo/client/ neo/tests/threaded/

[nobody at svn.erp5.org]

Author: jm
Date: Thu Jun 16 13:51:03 2011
New Revision: 2793

Log:
Compatibility with ZODB 3.4.x

Modified:
    trunk/neo/client/Storage.py
    trunk/neo/tests/threaded/__init__.py
    trunk/setup.py

Modified: trunk/neo/client/Storage.py
==============================================================================
--- trunk/neo/client/Storage.py [iso-8859-1] (original)
+++ trunk/neo/client/Storage.py [iso-8859-1] Thu Jun 16 13:51:03 2011
@@ -51,9 +51,9 @@ class Storage(BaseStorage.BaseStorage,
         # - transaction isolation is not done
         # ZODB.interfaces.IStorageIteration,
         ZODB.interfaces.IStorageUndoable,
-        ZODB.interfaces.IExternalGC,
+        getattr(ZODB.interfaces, 'IExternalGC', None), # XXX ZODB < 3.9
         getattr(ZODB.interfaces, 'ReadVerifyingStorage', None), # XXX ZODB 3.9
-        ZODB.interfaces.IMVCCStorage,
+        getattr(ZODB.interfaces, 'IMVCCStorage', None), # XXX ZODB < 3.9
     )))
 
     def __init__(self, master_nodes, name, read_only=False,

Modified: trunk/neo/tests/threaded/__init__.py
==============================================================================
--- trunk/neo/tests/threaded/__init__.py [iso-8859-1] (original)
+++ trunk/neo/tests/threaded/__init__.py [iso-8859-1] Thu Jun 16 13:51:03 2011
@@ -471,7 +471,7 @@ class NEOCluster(object):
 
     def getTransaction(self):
         txn = transaction.TransactionManager()
-        return txn, self.db.open(txn)
+        return txn, self.db.open(transaction_manager=txn)
 
 
 class NEOThreadedTest(NeoUnitTestBase):

Modified: trunk/setup.py
==============================================================================
--- trunk/setup.py [iso-8859-1] (original)
+++ trunk/setup.py [iso-8859-1] Thu Jun 16 13:51:03 2011
@@ -12,7 +12,7 @@ if not os.path.exists('mock.py'):
 
 extras_require = {
     'admin': [],
-    'client': ['ZODB3 >= 3.9'],
+    'client': ['ZODB3'], # ZODB3 >= 3.10
     'ctl': [],
     'master': [],
     'storage-btree': ['ZODB3'],