[Zope-Checkins] CVS: ZODB3/ZODB - Connection.py:1.100.2.5

[Tim Peters]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv23117/ZODB

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	Connection.py 
Log Message:
_setstate_noncurrent():  When the timestamp assertion fails, display long
integers instead of an 8-byte string repr.

For the current FileStorage failures in checkConcurrentUpdatesInVersions,
here's the output from 3 (consecutive) failing runs:

(239088484255058449L,
 239088484270806666L,
 239088484270806664L)

(239088486881430954L,
 239088486901474133L,
 239088486897179161L)

(239088489783397188L,
 239088489799145403L,
 239088489794850432L)

So it's the second half of

        assert start < self._txn_time <= end

that's consistently failing.


=== ZODB3/ZODB/Connection.py 1.100.2.4 => 1.100.2.5 ===
--- ZODB3/ZODB/Connection.py:1.100.2.4	Mon Dec  1 10:16:09 2003
+++ ZODB3/ZODB/Connection.py	Mon Dec  1 12:32:05 2003
@@ -24,7 +24,7 @@
 from coptimizations import new_persistent_id
 from ConflictResolution import ResolvedSerial
 from Transaction import Transaction, get_transaction
-from ZODB.utils import oid_repr
+from ZODB.utils import oid_repr, U64
 
 from cPickle import Unpickler, Pickler
 from cStringIO import StringIO
@@ -644,7 +644,8 @@
         # The non-current transaction must have been written before
         # txn_time.  It must be current at txn_time, but could have
         # been modified at txn_time.
-        assert start < self._txn_time <= end, (start, self._txn_time, end)
+        assert start < self._txn_time <= end, \
+               (U64(start), U64(self._txn_time), U64(end))
         self._noncurrent[obj._p_oid] = True
         self._set_ghost_state(obj, data, serial)