[Zope3-checkins] CVS: ZODB/src/ZODB - Connection.py:1.154

[Tim Peters]

Update of /cvs-repository/ZODB/src/ZODB
In directory cvs.zope.org:/tmp/cvs-serv28993/src/ZODB

Modified Files:
	Connection.py 
Log Message:
_setstate_noncurrent():  New assert.  Hoping to get closer to the true
cause of the:

  TypeError: unpack() argument 2 must be string or read-only buffer, not None

failure often seen in overnight testrunner reports now, coming from the
checkConcurrentUpdatesInVersions test.  If the hypothesis is correct,
we'll see a failure of the new

        assert end is not None

instead.


=== ZODB/src/ZODB/Connection.py 1.153 => 1.154 ===
--- ZODB/src/ZODB/Connection.py:1.153	Fri Apr 16 16:26:16 2004
+++ ZODB/src/ZODB/Connection.py	Mon Apr 19 16:24:02 2004
@@ -572,9 +572,9 @@
         # calls add(), the newly added objects will show up in
         # _added_during_commit.  This sounds insane, but has actually
         # happened.
-        
+
         self._added_during_commit = []
-        
+
         for obj in self._registered_objects:
             oid = obj._p_oid
             assert oid
@@ -875,6 +875,7 @@
         # been modified at txn_time.
 
         assert start < self._txn_time, (u64(start), u64(self._txn_time))
+        assert end is not None
         assert self._txn_time <= end, (u64(self._txn_time), u64(end))
         self._reader.setGhostState(obj, data)
         obj._p_serial = start