Mercurial Repositories > eric / file diff

--- a/Helpviewer/Bookmarks/BookmarksManager.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Sat Jan 02 15:11:35 2010 +0000
@@ -13,11 +13,11 @@
 from PyQt4.QtGui import *
 from PyQt4.QtWebKit import QWebPage
 
-from BookmarkNode import BookmarkNode
-from BookmarksModel import BookmarksModel
-from DefaultBookmarks import DefaultBookmarks
-from XbelReader import XbelReader
-from XbelWriter import XbelWriter
+from .BookmarkNode import BookmarkNode
+from .BookmarksModel import BookmarksModel
+from .DefaultBookmarks import DefaultBookmarks
+from .XbelReader import XbelReader
+from .XbelWriter import XbelWriter
 
 from Utilities.AutoSaver import AutoSaver
 import Utilities
@@ -348,7 +348,7 @@
                 return
             
             webpage = QWebPage()
-            webpage.mainFrame().setHtml(unicode(inFile.readAll()))
+            webpage.mainFrame().setHtml(inFile.readAll())
             result = webpage.mainFrame().evaluateJavaScript(extract_js)
             buffer_ = QBuffer(result)
             buffer_.open(QIODevice.ReadOnly)