--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py Fri Jan 05 16:04:03 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py Sat Jan 06 15:21:02 2024 +0100 @@ -105,7 +105,7 @@ @return imported bookmarks @rtype BookmarkNode """ - from ..BookmarkNode import BookmarkNode + from ..BookmarkNode import BookmarkNode, BookmarkNodeType try: with open(self.__fileName, "rb") as f: @@ -117,7 +117,7 @@ ) return None - importRootNode = BookmarkNode(BookmarkNode.Folder) + importRootNode = BookmarkNode(BookmarkNodeType.Folder) if ( bookmarksDict["WebBookmarkFileVersion"] == 1 and bookmarksDict["WebBookmarkType"] == "WebBookmarkTypeList" @@ -141,11 +141,11 @@ @param rootNode node to add the bookmarks to @type BookmarkNode """ - from ..BookmarkNode import BookmarkNode + from ..BookmarkNode import BookmarkNode, BookmarkNodeType for child in children: if child["WebBookmarkType"] == "WebBookmarkTypeList": - folder = BookmarkNode(BookmarkNode.Folder, rootNode) + folder = BookmarkNode(BookmarkNodeType.Folder, rootNode) folder.title = child["Title"].replace("&", "&&") if "Children" in child: self.__processChildren(child["Children"], folder) @@ -154,7 +154,7 @@ if url.startswith(("place:", "about:")): continue - bookmark = BookmarkNode(BookmarkNode.Bookmark, rootNode) + bookmark = BookmarkNode(BookmarkNodeType.Bookmark, rootNode) bookmark.url = url bookmark.title = child["URIDictionary"]["title"].replace("&", "&&")