diff -r 9aea3575bd16 -r 72d9b5ea39b4 src/eric7/WebBrowser/Bookmarks/NsHtmlReader.py
--- a/src/eric7/WebBrowser/Bookmarks/NsHtmlReader.py Fri Jan 05 16:04:03 2024 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/NsHtmlReader.py Sat Jan 06 15:21:02 2024 +0100
@@ -13,7 +13,7 @@
from eric7 import Utilities
-from .BookmarkNode import BookmarkNode
+from .BookmarkNode import BookmarkNode, BookmarkNodeType
class NsHtmlReader(QObject):
@@ -55,14 +55,14 @@
else:
f = QFile(fileNameOrDevice)
if not f.exists():
- return BookmarkNode(BookmarkNode.Root)
+ return BookmarkNode(BookmarkNodeType.Root)
f.open(QIODevice.OpenModeFlag.ReadOnly)
dev = f
folders = []
lastNode = None
- root = BookmarkNode(BookmarkNode.Root)
+ root = BookmarkNode(BookmarkNodeType.Root)
folders.append(root)
while not dev.atEnd():
@@ -81,7 +81,7 @@
# folder definition
arguments = match.group(1)
name = match.group(2)
- node = BookmarkNode(BookmarkNode.Folder, folders[-1])
+ node = BookmarkNode(BookmarkNodeType.Folder, folders[-1])
node.title = Utilities.html_udecode(name)
node.expanded = self.__foldedRx.search(arguments) is None
addedMatch = self.__addedRx.search(arguments)
@@ -98,7 +98,7 @@
# bookmark definition
arguments = match.group(1)
name = match.group(2)
- node = BookmarkNode(BookmarkNode.Bookmark, folders[-1])
+ node = BookmarkNode(BookmarkNodeType.Bookmark, folders[-1])
node.title = Utilities.html_udecode(name)
match1 = self.__urlRx.search(arguments)
if match1 is not None:
@@ -121,6 +121,6 @@
elif match.re is self.__separatorRx:
# separator definition
- BookmarkNode(BookmarkNode.Separator, folders[-1])
+ BookmarkNode(BookmarkNodeType.Separator, folders[-1])
return root
