[Zodb-checkins] SVN: ZODB/trunk/ Merge rev 27723 from 3.3 branch.
Tim Peters
tim.one at comcast.net
Thu Sep 30 17:02:07 EDT 2004
Log message for revision 27724:
Merge rev 27723 from 3.3 branch.
Merge rev 27722 from Zope trunk.
Collector #1517: History tab for ZPT does not work
FileStorage.history() was reading the user, description,
and extension fields out of the object pickle, due to
starting the read at a wrong location.
Changed:
U ZODB/trunk/NEWS.txt
U ZODB/trunk/src/ZODB/FileStorage/FileStorage.py
-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt 2004-09-30 21:00:33 UTC (rev 27723)
+++ ZODB/trunk/NEWS.txt 2004-09-30 21:02:07 UTC (rev 27724)
@@ -37,6 +37,15 @@
Restored Connection's private ``_opened`` attribute. This was still
referenced by ``DB.connectionDebugInfo()``, and Zope 2 calls the latter.
+FileStorage
+-----------
+
+Collector #1517: History tab for ZPT does not work. ``FileStorage.history()``
+was reading the user, description, and extension fields out of the object
+pickle, due to starting the read at a wrong location. Looked like
+cut-and-paste repetition of the same bug in ``FileStorage.FileIterator``
+noted in the news for 3.3c1.
+
What's new in ZODB3 3.3 release candidate 1?
============================================
Release date: 14-Sep-2004
Modified: ZODB/trunk/src/ZODB/FileStorage/FileStorage.py
===================================================================
--- ZODB/trunk/src/ZODB/FileStorage/FileStorage.py 2004-09-30 21:00:33 UTC (rev 27723)
+++ ZODB/trunk/src/ZODB/FileStorage/FileStorage.py 2004-09-30 21:02:07 UTC (rev 27724)
@@ -1259,16 +1259,14 @@
wantver = None
th = self._read_txn_header(h.tloc)
- user_name = self._file.read(th.ulen)
- description = self._file.read(th.dlen)
- if th.elen:
- d = loads(self._file.read(th.elen))
+ if th.ext:
+ d = loads(th.ext)
else:
d = {}
d.update({"time": TimeStamp(h.tid).timeTime(),
- "user_name": user_name,
- "description": description,
+ "user_name": th.user,
+ "description": th.descr,
"tid": h.tid,
"version": h.version,
"size": h.plen,
More information about the Zodb-checkins
mailing list