[Zope3-checkins] CVS: ZODB4/src/zodb/storage - file.py:1.8.4.11

[Barry Warsaw]

Update of /cvs-repository/ZODB4/src/zodb/storage
In directory cvs.zope.org:/tmp/cvs-serv13395

Modified Files:
      Tag: opaque-pickles-branch
	file.py 
Log Message:
Jeremy and I fixed the same thing in different ways.  Merge.


=== ZODB4/src/zodb/storage/file.py 1.8.4.10 => 1.8.4.11 ===
--- ZODB4/src/zodb/storage/file.py:1.8.4.10	Wed Mar 12 12:27:29 2003
+++ ZODB4/src/zodb/storage/file.py	Wed Mar 12 12:33:11 2003
@@ -961,16 +961,15 @@
                 data = None
             if data is None:
                 dlen = 0
-                nrefs = 0
+                assert refs is None
+                refs = []
             else:
                 dlen = len(data)
-                nrefs = len(refs)
+                assert refs is not None
             # Write the recovery data record
-            if refs is None:
-                refs = []
             self._tfile.write(pack(DATA_HDR,
                                    oid, serial, old, self._pos,
-                                   len(version), nrefs, dlen))
+                                   len(version), len(refs), dlen))
             # We need to write some version information if this revision is
             # happening in a version.
             if version: