diff -r b0996e4a289e -r 1d8dd9706f46 Helpviewer/History/HistoryManager.py --- a/Helpviewer/History/HistoryManager.py Fri Jan 01 16:11:36 2010 +0000 +++ b/Helpviewer/History/HistoryManager.py Sat Jan 02 15:11:35 2010 +0000 @@ -11,9 +11,9 @@ from PyQt4.QtGui import * from PyQt4.QtWebKit import QWebHistoryInterface, QWebSettings -from HistoryModel import HistoryModel -from HistoryFilterModel import HistoryFilterModel -from HistoryTreeModel import HistoryTreeModel +from .HistoryModel import HistoryModel +from .HistoryFilterModel import HistoryFilterModel +from .HistoryTreeModel import HistoryTreeModel from Utilities.AutoSaver import AutoSaver import Utilities @@ -353,9 +353,9 @@ if ver != HISTORY_VERSION: continue itm = HistoryEntry() - itm.url = stream.readString() + itm.url = stream.readString().decode() stream >> itm.dateTime - itm.title = stream.readString() + itm.title = stream.readString().decode() if not itm.dateTime.isValid(): continue @@ -422,9 +422,9 @@ stream = QDataStream(data, QIODevice.WriteOnly) itm = self.__history[index] stream.writeUInt32(HISTORY_VERSION) - stream.writeString(itm.url) + stream.writeString(itm.url.encode()) stream << itm.dateTime - stream.writeString(itm.title) + stream.writeString(itm.title.encode()) f.write(data) f.close()