Merge rev 27222 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.

branches/3.3/NEWS.txt

@@ -21,6 +21,15 @@ Connection
 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

branches/3.3/src/ZODB/FileStorage/FileStorage.py

@@ -1259,16 +1259,14 @@ class FileStorage(BaseStorage.BaseStorage,
                     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,