tests: sort hunks of ZODB3.patch to match output of git-show

ZODB3.patch

 Patch to ZODB 3.10.5 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 8e72272..61bc801 100644
 --- a/src/ZODB/tests/BasicStorage.py
@@ -17,6 +41,77 @@ index 8e72272..61bc801 100644
          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 e01c802..b57de28 100644
+--- a/src/ZODB/tests/MTStorage.py
++++ b/src/ZODB/tests/MTStorage.py
+@@ -155,10 +155,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 9113757..ddd2dde 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 9737ec4..43f29ed 100644
+--- a/src/ZODB/tests/StorageTestBase.py
++++ b/src/ZODB/tests/StorageTestBase.py
+@@ -134,7 +134,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)
+@@ -191,7 +191,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
+@@ -211,8 +213,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 = undo_result and undo_result[1] or []
+             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 72adac2..698e288 100644
 --- a/src/ZODB/tests/TransactionalUndoStorage.py
@@ -125,98 +220,3 @@ index 72adac2..698e288 100644
          revid1 = self._transaction_newserial(oid1)
          revid2 = self._transaction_newserial(oid2)
          eq(revid1, revid2)
-diff --git a/src/ZODB/tests/StorageTestBase.py b/src/ZODB/tests/StorageTestBase.py
-index 9737ec4..43f29ed 100644
---- a/src/ZODB/tests/StorageTestBase.py
-+++ b/src/ZODB/tests/StorageTestBase.py
-@@ -134,7 +134,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)
-@@ -191,7 +191,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
-@@ -211,8 +213,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 = undo_result and undo_result[1] or []
-             oids.extend(oid for (oid, _) in vote_result or ())
-             self.assertEqual(len(oids), len(expected_oids), repr(oids))
-diff --git a/src/ZODB/tests/MTStorage.py b/src/ZODB/tests/MTStorage.py
-index e01c802..b57de28 100644
---- a/src/ZODB/tests/MTStorage.py
-+++ b/src/ZODB/tests/MTStorage.py
-@@ -155,10 +155,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 9113757..ddd2dde 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/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