Mercurial Repositories > eric / file diff

--- a/Helpviewer/Bookmarks/BookmarksManager.py	Mon Dec 28 18:31:37 2009 +0000
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Wed Dec 30 15:40:33 2009 +0000
@@ -349,7 +349,7 @@
             
             webpage = QWebPage()
             webpage.mainFrame().setHtml(unicode(inFile.readAll()))
-            result = webpage.mainFrame().evaluateJavaScript(extract_js).toByteArray()
+            result = webpage.mainFrame().evaluateJavaScript(extract_js)
             buffer_ = QBuffer(result)
             buffer_.open(QIODevice.ReadOnly)
             importRootNode = reader.read(buffer_)
@@ -397,9 +397,7 @@
         bmNames = Preferences.Prefs.settings.value('Bookmarks/Names')
         bmFiles = Preferences.Prefs.settings.value('Bookmarks/Files')
         
-        if bmNames.isValid() and bmFiles.isValid():
-            bmNames = bmNames.toStringList()
-            bmFiles = bmFiles.toStringList()
+        if bmNames is not None and bmFiles is not None:
             if len(bmNames) == len(bmFiles):
                 convertedRootNode = BookmarkNode(BookmarkNode.Folder)
                 convertedRootNode.title = self.trUtf8("Converted {0}")\