Mercurial Repositories > eric / file diff

--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py	Fri Jan 05 16:04:03 2024 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sat Jan 06 15:21:02 2024 +0100
@@ -119,9 +119,9 @@
         @return imported bookmarks
         @rtype BookmarkNode
         """
-        from ..BookmarkNode import BookmarkNode
+        from ..BookmarkNode import BookmarkNode, BookmarkNodeType
 
-        importRootNode = BookmarkNode(BookmarkNode.Root)
+        importRootNode = BookmarkNode(BookmarkNodeType.Root)
 
         # step 1: build the hierarchy of bookmark folders
         folders = {}
@@ -137,9 +137,9 @@
                 parent = row[1]
                 title = row[2]
                 folder = (
-                    BookmarkNode(BookmarkNode.Folder, folders[parent])
+                    BookmarkNode(BookmarkNodeType.Folder, folders[parent])
                     if parent in folders
-                    else BookmarkNode(BookmarkNode.Folder, importRootNode)
+                    else BookmarkNode(BookmarkNodeType.Folder, importRootNode)
                 )
                 folder.title = title.replace("&", "&&")
                 folders[id_] = folder
@@ -174,9 +174,13 @@
                         continue
 
                     if parent in folders:
-                        bookmark = BookmarkNode(BookmarkNode.Bookmark, folders[parent])
+                        bookmark = BookmarkNode(
+                            BookmarkNodeType.Bookmark, folders[parent]
+                        )
                     else:
-                        bookmark = BookmarkNode(BookmarkNode.Bookmark, importRootNode)
+                        bookmark = BookmarkNode(
+                            BookmarkNodeType.Bookmark, importRootNode
+                        )
                     bookmark.url = url.toString()
                     bookmark.title = title.replace("&", "&&")
         except sqlite3.DatabaseError as err:
@@ -186,7 +190,7 @@
             )
             return None
 
-        importRootNode.setType(BookmarkNode.Folder)
+        importRootNode.setType(BookmarkNodeType.Folder)
         if self._id == "firefox":
             importRootNode.title = self.tr("Mozilla Firefox Import")
         else: