Add support for recent ZODB

ZODB.patch

+Patch to ZODB 4.2.0 for ZODB unit tests.
+See also monkey-patch to Connection.tpc_finish in neo/client/__init__.py
+
+diff --git a/src/ZODB/interfaces.py b/src/ZODB/interfaces.py
+index 44ded35..db5c525 100644
+--- a/src/ZODB/interfaces.py
++++ b/src/ZODB/interfaces.py
+@@ -776,6 +776,10 @@ def tpc_finish(transaction, func = lambda tid: None):
+         called while the storage transaction lock is held.  It takes
+         the new transaction id generated by the transaction.
+ 
++        The return value can be either None or a serial giving new
++        serial for objects whose ids were passed to previous store calls
++        in the same transaction, and for which no serial was returned
++        from either store or tpc_vote for objects passed to store.
+         """
+ 
+     def tpc_vote(transaction):
+@@ -794,8 +798,6 @@ def tpc_vote(transaction):
+         The return value can be either None or a sequence of object-id
+         and serial pairs giving new serials for objects who's ids were
+         passed to previous store calls in the same transaction.
+-        After the tpc_vote call, new serials must have been returned,
+-        either from tpc_vote or store for objects passed to store.
+ 
+         A serial returned in a sequence of oid/serial pairs, may be
+         the special value ZODB.ConflictResolution.ResolvedSerial to
+diff --git a/src/ZODB/tests/BasicStorage.py b/src/ZODB/tests/BasicStorage.py
+index e5c0526..0291654 100644
+--- a/src/ZODB/tests/BasicStorage.py
++++ b/src/ZODB/tests/BasicStorage.py
+@@ -69,8 +69,10 @@ def checkSerialIsNoneForInitialRevision(self):
+         r1 = self._storage.store(oid, None, zodb_pickle(MinPO(11)),
+                                        '', txn)
+         r2 = self._storage.tpc_vote(txn)
+-        self._storage.tpc_finish(txn)
++        serial = self._storage.tpc_finish(txn)
+         newrevid = handle_serials(oid, r1, r2)
++        if newrevid is None and serial is not None:
++            newrevid = serial
+         data, revid = self._storage.load(oid, '')
+         value = zodb_unpickle(data)
+         eq(value, MinPO(11))
+diff --git a/src/ZODB/tests/MTStorage.py b/src/ZODB/tests/MTStorage.py
+index 4ea139c..347cae3 100644
+--- a/src/ZODB/tests/MTStorage.py
++++ b/src/ZODB/tests/MTStorage.py
+@@ -152,10 +152,12 @@ def dostore(self, i):
+         r2 = self.storage.tpc_vote(t)
+         self.pause()
+ 
+-        self.storage.tpc_finish(t)
++        serial = self.storage.tpc_finish(t)
+         self.pause()
+ 
+         revid = handle_serials(oid, r1, r2)
++        if serial is not None and revid is None:
++            revid = serial
+         self.oids[oid] = revid
+ 
+ class ExtStorageClientThread(StorageClientThread):
+diff --git a/src/ZODB/tests/RevisionStorage.py b/src/ZODB/tests/RevisionStorage.py
+index 2a5c370..0a0120a 100644
+--- a/src/ZODB/tests/RevisionStorage.py
++++ b/src/ZODB/tests/RevisionStorage.py
+@@ -150,10 +150,12 @@ def helper(tid, revid, x):
+                 # Finish the transaction
+                 r2 = self._storage.tpc_vote(t)
+                 newrevid = handle_serials(oid, r1, r2)
+-                self._storage.tpc_finish(t)
++                serial = self._storage.tpc_finish(t)
+             except:
+                 self._storage.tpc_abort(t)
+                 raise
++            if serial is not None and newrevid is None:
++                newrevid = serial
+             return newrevid
+         revid1 = helper(1, None, 1)
+         revid2 = helper(2, revid1, 2)
+diff --git a/src/ZODB/tests/StorageTestBase.py b/src/ZODB/tests/StorageTestBase.py
+index f0a2b72..5305807 100644
+--- a/src/ZODB/tests/StorageTestBase.py
++++ b/src/ZODB/tests/StorageTestBase.py
+@@ -132,7 +132,7 @@ def handle_serials(oid, *args):
+ 
+     A helper for function _handle_all_serials().
+     """
+-    return handle_all_serials(oid, *args)[oid]
++    return handle_all_serials(oid, *args).get(oid)
+ 
+ def import_helper(name):
+     __import__(name)
+@@ -189,7 +189,9 @@ def _dostore(self, oid=None, revid=None, data=None,
+             # Finish the transaction
+             r2 = self._storage.tpc_vote(t)
+             revid = handle_serials(oid, r1, r2)
+-            self._storage.tpc_finish(t)
++            serial = self._storage.tpc_finish(t)
++            if serial is not None and revid is None:
++                revid = serial
+         except:
+             self._storage.tpc_abort(t)
+             raise
+@@ -209,8 +211,8 @@ def _undo(self, tid, expected_oids=None, note=None):
+         self._storage.tpc_begin(t)
+         undo_result = self._storage.undo(tid, t)
+         vote_result = self._storage.tpc_vote(t)
+-        self._storage.tpc_finish(t)
+-        if expected_oids is not None:
++        serial = self._storage.tpc_finish(t)
++        if expected_oids is not None and serial is None:
+             oids = list(undo_result[1]) if undo_result else []
+             oids.extend(oid for (oid, _) in vote_result or ())
+             self.assertEqual(len(oids), len(expected_oids), repr(oids))
+diff --git a/src/ZODB/tests/TransactionalUndoStorage.py b/src/ZODB/tests/TransactionalUndoStorage.py
+index a9490e1..b3f2ded 100644
+--- a/src/ZODB/tests/TransactionalUndoStorage.py
++++ b/src/ZODB/tests/TransactionalUndoStorage.py
+@@ -73,6 +73,12 @@ def _transaction_vote(self, trans):
+     def _transaction_newserial(self, oid):
+         return self.__serials[oid]
+ 
++    def _transaction_finish(self, t, oid_list):
++        tid = self._storage.tpc_finish(t)
++        if tid is not None:
++            for oid in oid_list:
++                self.__serials[oid] = tid
++
+     def _multi_obj_transaction(self, objs):
+         newrevs = {}
+         t = Transaction()
+@@ -82,7 +88,7 @@ def _multi_obj_transaction(self, objs):
+             self._transaction_store(oid, rev, data, '', t)
+             newrevs[oid] = None
+         self._transaction_vote(t)
+-        self._storage.tpc_finish(t)
++        self._transaction_finish(t, [x[0] for x in objs])
+         for oid in newrevs.keys():
+             newrevs[oid] = self._transaction_newserial(oid)
+         return newrevs
+@@ -215,9 +221,9 @@ def checkTwoObjectUndo(self):
+         self._transaction_store(oid2, revid2, p51, '', t)
+         # Finish the transaction
+         self._transaction_vote(t)
++        self._transaction_finish(t, [oid1, oid2])
+         revid1 = self._transaction_newserial(oid1)
+         revid2 = self._transaction_newserial(oid2)
+-        self._storage.tpc_finish(t)
+         eq(revid1, revid2)
+         # Update those same two objects
+         t = Transaction()
+@@ -227,9 +233,9 @@ def checkTwoObjectUndo(self):
+         self._transaction_store(oid2, revid2, p52, '', t)
+         # Finish the transaction
+         self._transaction_vote(t)
++        self._transaction_finish(t, [oid1, oid2])
+         revid1 = self._transaction_newserial(oid1)
+         revid2 = self._transaction_newserial(oid2)
+-        self._storage.tpc_finish(t)
+         eq(revid1, revid2)
+         # Make sure the objects have the current value
+         data, revid1 = self._storage.load(oid1, '')
+@@ -285,11 +291,12 @@ def checkTwoObjectUndoAtOnce(self):
+         tid1 = info[1]['id']
+         t = Transaction()
+         oids = self._begin_undos_vote(t, tid, tid1)
+-        self._storage.tpc_finish(t)
++        serial = self._storage.tpc_finish(t)
+         # We get the finalization stuff called an extra time:
+-        eq(len(oids), 4)
+-        unless(oid1 in oids)
+-        unless(oid2 in oids)
++        if serial is None:
++            eq(len(oids), 4)
++            unless(oid1 in oids)
++            unless(oid2 in oids)
+         data, revid1 = self._storage.load(oid1, '')
+         eq(zodb_unpickle(data), MinPO(30))
+         data, revid2 = self._storage.load(oid2, '')
+@@ -323,7 +330,7 @@ def checkTwoObjectUndoAgain(self):
+         self._transaction_store(oid2, revid2, p52, '', t)
+         # Finish the transaction
+         self._transaction_vote(t)
+-        self._storage.tpc_finish(t)
++        self._transaction_finish(t, [oid1, oid2])
+         revid1 = self._transaction_newserial(oid1)
+         revid2 = self._transaction_newserial(oid2)
+         eq(revid1, revid2)
+@@ -343,7 +350,7 @@ def checkTwoObjectUndoAgain(self):
+         self._transaction_store(oid2, revid2, p53, '', t)
+         # Finish the transaction
+         self._transaction_vote(t)
+-        self._storage.tpc_finish(t)
++        self._transaction_finish(t, [oid1, oid2])
+         revid1 = self._transaction_newserial(oid1)
+         revid2 = self._transaction_newserial(oid2)
+         eq(revid1, revid2)
+@@ -355,10 +362,11 @@ def checkTwoObjectUndoAgain(self):
+         tid = info[1]['id']
+         t = Transaction()
+         oids = self._begin_undos_vote(t, tid)
+-        self._storage.tpc_finish(t)
+-        eq(len(oids), 1)
+-        self.assertTrue(oid1 in oids)
+-        self.assertTrue(not oid2 in oids)
++        serial = self._storage.tpc_finish(t)
++        if serial is None:
++            eq(len(oids), 1)
++            self.assertTrue(oid1 in oids)
++            self.assertTrue(not oid2 in oids)
+         data, revid1 = self._storage.load(oid1, '')
+         eq(zodb_unpickle(data), MinPO(33))
+         data, revid2 = self._storage.load(oid2, '')
+@@ -395,7 +403,7 @@ def checkNotUndoable(self):
+         self._transaction_store(oid1, revid1, p81, '', t)
+         self._transaction_store(oid2, revid2, p91, '', t)
+         self._transaction_vote(t)
+-        self._storage.tpc_finish(t)
++        self._transaction_finish(t, [oid1, oid2])
+         revid1 = self._transaction_newserial(oid1)
+         revid2 = self._transaction_newserial(oid2)
+         eq(revid1, revid2)

neo/client/app.py

@@ -566,8 +566,10 @@ class Application(ThreadedApplication):
                     self._store(txn_context, oid, conflict_serial, new_data)
                     append(oid)
                     continue
+            # With recent ZODB, get_pickle_metadata (from ZODB.utils) does
+            # not support empty values, so do not pass 'data' in this case.
             raise ConflictError(oid=oid, serials=(conflict_serial,
-                serial), data=data)
+                serial), data=data or None)
         return result
 
     def waitResponses(self, queue):
@@ -961,7 +963,7 @@ class Application(ThreadedApplication):
         return self.last_tid
 
     def pack(self, t):
-        tid = repr(TimeStamp(*time.gmtime(t)[:5] + (t % 60, )))
+        tid = TimeStamp(*time.gmtime(t)[:5] + (t % 60, )).raw()
         if tid == ZERO_TID:
             raise NEOStorageError('Invalid pack time')
         self._askPrimary(Packets.AskPack(tid))

setup.py

@@ -23,7 +23,7 @@ if not os.path.exists('mock.py'):
         raise EnvironmentError("MD5 checksum mismatch downloading 'mock.py'")
     open('mock.py', 'w').write(mock_py)
 
-zodb_require = ['ZODB3>=3.10', 'ZODB3<3.11dev']
+zodb_require = ['ZODB3>=3.10dev']
 
 extras_require = {
     'admin': [],