Frontport changes made on 3.1 release branch just prior to release.

doc/ZEO/ClientCache.txt

@@ -41,11 +41,6 @@ ZEO Client Cache
 
   and so on.
 
-  As of ZEO 2.0 beta 2, the above algorithm is augmented as follows.
-  When a cache load finds a hit in the "old" cache file, the data is
-  copied to the "current" cache file.  This appears to improve the hit
-  rate.
-
   Persistent cache files are created in the directory named in the
   'var' argument to the ClientStorage (see ClientStorage.txt) or in
   the 'var' subdirectory of the directory given by the INSTANCE_HOME

src/ZEO/__init__.py

@@ -21,4 +21,4 @@ ZEO's home on the web is
 
 """
 
-version = "2.0b2"
+version = "2.0b3"

src/ZEO/version.txt

-2.0b2
+2.0b3
+
 

src/ZODB/tests/TransactionalUndoStorage.py

@@ -556,7 +556,7 @@ class TransactionalUndoStorage:
         orig = []
         for i in range(BATCHES):
             t = Transaction()
-            tid = p64(i+1)
+            tid = p64(i)
             s.tpc_begin(t, tid)
             for j in range(OBJECTS):
                 oid = s.new_oid()
@@ -602,7 +602,7 @@ class TransactionalUndoStorage:
             txn = iter[offset]
             offset += 1
             
-            tid = p64(i + 1)
+            tid = p64(i)
             eq(txn.tid, tid)
 
             L1 = [(rec.oid, rec.serial, rec.data_txn) for rec in txn]
@@ -621,7 +621,7 @@ class TransactionalUndoStorage:
             offset += 1
 
             # The undos are performed in reverse order.
-            otid = p64(BATCHES - i)
+            otid = p64(BATCHES - 1 - i)
             L1 = [(rec.oid, rec.data_txn) for rec in txn]
             L2 = [(oid, otid) for _tid, oid, revid in orig
                   if _tid == otid]